解决冲突

pageA/chat/chat.vue

@@ -5,7 +5,7 @@
 				<u-icon name="arrow-left" @click="return1()" size="20"></u-icon>
 				<text class="title">{{user_other.merchant_name || user_other.easemob_nickname}}</text>
 			</view>
-			<view  class="u-flex" slot="right" @click="goshop(8)">
+			<view class="u-flex" slot="right" @click="goshop(user_other.id)">
 				<view v-if="user_other.merchant_name" class="dian">店铺</view>
 				<view class="" style="width: 200rpx;"></view>
 				<!-- <text class="title">{{user_other.merchant_name}}</text> -->
@@ -28,7 +28,7 @@
 					</view>
 				</view>
 				<view class="chat-header" v-if="item.type == 'txt' && item.ext.type == 'shopinfo'"
-					:style="{top:(statusheight + 58) + 'px'}" @click="toinfo(item,'shopinfo')">
+					:style="{top:(statusheight + 58) + 'px'}" @click="toinfo(item.ext.order.id)">
 					<view class="u-flex ">
 						<image :src="item.ext.order.image" style="width: 152rpx;height: 152rpx;" mode=""></image>
 						<view class="u-flex-column u-row-between" style="margin-left: 20rpx;height: 152rpx;">
@@ -48,7 +48,7 @@
 					</view>
 				</view>
 				<view class="chat-header" v-if="item.type == 'txt' && item.ext.type == 'shopinfo'"
-					:style="{top:(statusheight + 58) + 'px'}" @click="toinfo(item,'shopinfo')">
+					:style="{top:(statusheight + 58) + 'px'}" @click="toinfo(item.ext.order.id)">
 					<view class="u-flex ">
 						<image :src="item.ext.order.image" style="width: 152rpx;height: 152rpx;" mode=""></image>
 						<view class="u-flex-column u-row-between" style="margin-left: 20rpx;height: 152rpx;">
@@ -247,27 +247,17 @@
 						console.log('失败', e);
 					});
 			},
-			toinfo(item, type) {
-				if (type == 'pos' && item.ext.order.item_url) {
-					uni.navigateTo({
-						url: "/pagesB/details?id=" + item.ext.order.item_url
-					})
-				} else if (type == 'cand') {
-					uni.navigateTo({
-						url: "/pagesC/rencai-info?id=" + item.ext.order.item_url
-					})
-				} else if (type == 'order') {
-					uni.navigateTo({
-						url: "/pagesD/order-detail?id=" + item.ext.order.item_url
-					})
-				}
+			toinfo(id) {
+				uni.navigateTo({
+					url: '/pageA/productdetails?id=' + id
+				})
 			}
 		}
 	}
 </script>
 
 <style lang="scss">
-	.dian{
+	.dian {
 		height: 48rpx;
 		border-radius: 24rpx;
 		border: 1rpx solid rgba(151, 151, 151, 0.5);
@@ -281,6 +271,7 @@
 		text-align: center;
 		font-style: normal;
 	}
+
 	.chatfu {
 		font-family: PingFangSC, PingFang SC;
 		font-weight: 400;

pageA/productdetails.vue

@@ -700,7 +700,7 @@
 							'image': that.goodinfo.image,
 							'discount_price': that.goodinfo.discount_price,
 							'fu': that.fu,
-
+							'id':that.id
 						},
 						'user_other': that.goodinfo.merchant,
 						'user': useinfo,

pageB/expresstype.vue

@@ -2,7 +2,7 @@
 	<view class="box">
 		<view class="exp">
 			<u-radio-group v-model="radiovalue1" placement="column" @change="groupChange">
-				<view class="item u-flex u-row-between" v-for="(item,idx) in radiolist1" :key="idx">
+				<view class="item u-flex u-row-between" v-for="(item,idx) in radiolist1" v-if="idx<page" :key="idx">
 					<text>{{item.name}}</text>
 					<u-radio :name="item.name" @change="radioChange(item)">
 					</u-radio>
@@ -24,6 +24,7 @@
 				concant: '',
 				code: '',
 				radiolist1: [],
+				page: 20
 			};
 		},
 		computed: {
@@ -31,17 +32,22 @@
 				return this.$t('index')
 			}
 		},
+		onReachBottom() {
+			if (this.page < this.radiolist1.length) {
+				this.page += 20
+			}
+		},
 		onLoad() {
-			this.getlist()
+			if (uni.getStorageSync('radiolist1')) {
+				console.log(uni.getStorageSync('radiolist1'));
+				this.radiolist1 = uni.getStorageSync('radiolist1')
+			}
 		},
 		methods: {
-			getlist() {
-				uni.$u.http.get('/api/express-company', {}).then((res) => {
-					this.radiolist1 = res
-				}).catch(() => {
-
-				})
+			load(index) {
+				console.log(index)
 			},
+
 			toteach() {
 				const eventChannel = this.getOpenerEventChannel();
 				eventChannel.emit('todcp', {
@@ -54,9 +60,8 @@
 				console.log('groupChange', n);
 			},
 			radioChange(n) {
-				console.log('radioChange', n);
 				this.concant = n.name
-				this.code = n.name
+				this.code = n.code
 			}
 		}
 	}

pageB/parcel.vue

@@ -8,13 +8,16 @@
 			</view>
 		</view>
 		<view class="box">
-			<view class="boxitem u-flex">
+			<view class="boxitem u-flex u-row-between">
 				<text class="name">{{i18n.Expresscompany}}</text>
-				<input style="flex: 1;" type="text" :placeholder="i18n.ExpressCompany" v-model="logistics_company_name" />
+				<view class="u-flex" @click="toexpress">
+					<view class="selection">{{logistics_company_name||i18n.selection}}</view>
+					<image src="../static/express/next1.png" style="width: 30rpx;height: 30rpx;" mode=""></image>
+				</view>
 			</view>
 		</view>
 		<view class="box" style="border-radius:0 0 16rpx 16rpx">
-			<view class="boxitem u-flex">
+			<view class="boxitem u-flex u-row-end">
 				<text class="name">{{i18n.Parcelweight}}</text>
 				<input style="flex: 1;" type="text" :placeholder="i18n.parcelWeight" v-model="estimated_weight" />
 				<text>kg</text>
@@ -30,9 +33,10 @@
 	export default {
 		data() {
 			return {
-				logistics_company_name:'',//	顺丰快递	是	String	快递公司
-				logistics_no:'',//11111111	是	String	快递单号
-				estimated_weight:'',//	222	是	String	包裹重量
+				logistics_company_name: '', //	顺丰快递	是	String	快递公司
+				logistics_no: '', //11111111	是	String	快递单号
+				estimated_weight: '', //	222	是	String	包裹重量
+				code:''
 			};
 		},
 		computed: {
@@ -45,23 +49,34 @@
 				title: this.i18n.Addparcel
 			})
 		},
-		methods:{
+		methods: {
+			toexpress() {
+				uni.navigateTo({
+					url: '/pageB/expresstype',
+					events: {
+						todcp: (res) => {
+							this.logistics_company_name = res.concant
+							this.code = res.code
+						}
+					}
+				})
+			},
 			//线下下单
 			offline() {
 				uni.$u.http.post('/api/express-order/offline-create', {
-					logistics_company_code:this.logistics_company_name,//	顺丰快递	是	String	快递公司
-					logistics_no:this.logistics_no,//11111111	是	String	快递单号
-					estimated_weight:this.estimated_weight,//	222	是	String	包裹重量
+					logistics_company_code: this.code, //	顺丰快递	是	String	快递公司
+					logistics_no: this.logistics_no, //11111111	是	String	快递单号
+					estimated_weight: this.estimated_weight, //	222	是	String	包裹重量
 				}).then((res) => {
 					this.$u.toast('添加成功')
 					// uni.navigateTo({
 					// 	url:'pageB/myPackage'
 					// })
-					setTimeout(()=>{
+					setTimeout(() => {
 						uni.navigateBack()
-					},800)
+					}, 800)
 				}).catch(() => {
-			
+
 				})
 			},
 		}
@@ -69,6 +84,15 @@
 </script>
 
 <style lang="scss" scoped>
+	.selection {
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 400;
+		font-size: 28rpx;
+		color: #666666;
+		line-height: 40rpx;
+		text-align: left;
+		font-style: normal;
+	}
 	.btn {
 		width: 686rpx;
 		height: 88rpx;

pageD/homepage/homepage.vue

@@ -1,362 +1,336 @@
 <template>
-  <view class="page">
-    <!-- 页面渐变色背景 -->
-    <view class="shadow"> </view>
-    <!-- 页面渐变色背景 -->
-    <view class="content">
-      <view class="top-information">
-        <image class="user-header" :src="userInfo.image" mode=""> </image>
-        <view class="btn-list">
-          <!--v-if="show"  -->
-          <button class="btn-1" @click="tochat">
-            <u-icon color="#f83224" size="14" name="kefu-ermai"></u-icon>客服
-          </button>
-          <button
-            v-if="isShow != '1' && userInfo.is_interest == 1"
-            class="btn-1"
-            @click="followTeam(0)"
-          >
-            <u-icon color="#f83224" size="14" name="plus"></u-icon>关注
-          </button>
-          <button
-            class="btn-1"
-            v-if="userInfo.is_interest == 0"
-            @click="followTeam(1)"
-          >
-            已关注
-          </button>
-        </view>
-        <view class="name"> {{ userInfo.merchant_name }} </view>
+	<view class="page">
+		<!-- 页面渐变色背景 -->
+		<view class="shadow"> </view>
+		<!-- 页面渐变色背景 -->
+		<view class="content">
+			<view class="top-information">
+				<image class="user-header" :src="userInfo.image" mode=""> </image>
+				<view class="btn-list">
+					<!--v-if="show"  -->
+					<button class="btn-1" @click="tochat">
+						<u-icon color="#f83224" size="14" name="kefu-ermai"></u-icon>客服
+					</button>
+					<button v-if="isShow != '1' && userInfo.is_interest == 1" class="btn-1" @click="followTeam(0)">
+						<u-icon color="#f83224" size="14" name="plus"></u-icon>关注
+					</button>
+					<button class="btn-1" v-if="userInfo.is_interest == 0" @click="followTeam(1)">
+						已关注
+					</button>
+				</view>
+				<view class="name"> {{ userInfo.merchant_name }} </view>
 
-        <view class="score">
-          <u-rate
-            count="5"
-            disabled
-            :allowHalf="true"
-            :gutter="1"
-            inactiveColor="#ffacab"
-            activeColor="#FF1515"
-            v-model="userInfo.score"
-            :size="12"
-          ></u-rate>
-          <text class="num">{{ userInfo.score }}</text>
-        </view>
-        <view class="sale">
-          <view class="">
-            销售量
-            <text space="nbsp">{{ "&nbsp;" }} {{ userInfo.sales_num }}</text>
-          </view>
-          <text space="nbsp" class="shu"
-            >{{ "&nbsp;&nbsp;" }} | {{ "&nbsp;&nbsp;" }}</text
-          >
-          <view class="">
-            评价总数
-            <text space="nbsp">{{ "&nbsp;" }} {{ userInfo.comment_num }}</text>
-          </view>
-        </view>
-      </view>
+				<view class="score">
+					<u-rate count="5" disabled :allowHalf="true" :gutter="1" inactiveColor="#ffacab"
+						activeColor="#FF1515" v-model="userInfo.score" :size="12"></u-rate>
+					<text class="num">{{ userInfo.score }}</text>
+				</view>
+				<view class="sale">
+					<view class="">
+						销售量
+						<text space="nbsp">{{ "&nbsp;" }} {{ userInfo.sales_num }}</text>
+					</view>
+					<text space="nbsp" class="shu">{{ "&nbsp;&nbsp;" }} | {{ "&nbsp;&nbsp;" }}</text>
+					<view class="">
+						评价总数
+						<text space="nbsp">{{ "&nbsp;" }} {{ userInfo.comment_num }}</text>
+					</view>
+				</view>
+			</view>
 
-      <view class="goods-list">
-        <view class="tab-list">
-          <view :class="{ tab: selectTab == 1 }" @click="switchTab(1)">
-            默认
-          </view>
-          <view :class="{ tab: selectTab == 2 }" @click="switchTab(2)"
-            >新品</view
-          >
-          <view :class="{ tab: selectTab == 3 }" @click="switchTab(3)"
-            >销量</view
-          >
-          <view
-            class="price"
-            :class="{ tab: selectTab == 4 }"
-            @click="switchTab(4)"
-            >价格
-            <view
-              style="
+			<view class="goods-list">
+				<view class="tab-list">
+					<view :class="{ tab: selectTab == 1 }" @click="switchTab(1)">
+						默认
+					</view>
+					<view :class="{ tab: selectTab == 2 }" @click="switchTab(2)">新品</view>
+					<view :class="{ tab: selectTab == 3 }" @click="switchTab(3)">销量</view>
+					<view class="price" :class="{ tab: selectTab == 4 }" @click="switchTab(4)">价格
+						<view style="
                 display: flex;
                 flex-direction: column;
                 justify-content: center;
                 margin-left: 6rpx;
                 margin-top: 4rpx;
-              "
-            >
-              <u-icon
-                name="arrow-up-fill"
-                size="6"
-                :color="iconUp == 1 ? '#f83224' : '#303133'"
-              ></u-icon
-              ><u-icon
-                :color="iconUp == 2 ? '#f83224' : '#303133'"
-                size="6"
-                name="arrow-down-fill"
-              ></u-icon>
-            </view>
-          </view>
-        </view>
-        <view class="goods">
-          <GoodsCard
-            v-for="item in goodsList"
-            :key="item.id"
-            :itemInfo="item"
-            @toDetail="toDetail"
-          />
-        </view>
-      </view>
-    </view>
-  </view>
+              ">
+							<u-icon name="arrow-up-fill" size="6"
+								:color="iconUp == 1 ? '#f83224' : '#303133'"></u-icon><u-icon
+								:color="iconUp == 2 ? '#f83224' : '#303133'" size="6" name="arrow-down-fill"></u-icon>
+						</view>
+					</view>
+				</view>
+				<view class="goods">
+					<GoodsCard v-for="item in goodsList" :key="item.id" :itemInfo="item" @toDetail="toDetail" />
+				</view>
+			</view>
+		</view>
+	</view>
 </template>
 
 <script>
-import GoodsCard from "./component/goodsCard.vue";
-export default {
-  components: {
-    GoodsCard,
-  },
-  data() {
-    return {
-      value: 4,
-      selectTab: 0,
-      iconUp: 0,
-      isShow: "2", //是否可关注
-      userId: "",
-      userInfo: {}, //用户信息
-      goodsList: [],
-      user_other: {},
-      user_other_no: "",
-      show: "",
-    };
-  },
-  onLoad(option) {
-    if (option.page) {
-      this.isShow = option.page;
-    }
-    if (option.user_other) {
-      this.user_other = JSON.parse(decodeURIComponent(option.user_other));
-    }
-    this.show = option.show;
-    this.userId = option.merchant_id;
-    this.user_other_no = option.user_other_no;
-  },
-  methods: {
-    tochat() {
-      uni.navigateTo({
-        url:
-          "/pageA/chat/chat?user_other=" +
-          encodeURIComponent(JSON.stringify(this.user_other)) +
-          "&user_other_no=" +
-          this.user_other_no,
-      });
-    },
-    switchTab(num) {
-      this.selectTab = num;
-      if (num == 4) {
-        // this.iconUp = this.iconUp == 0 ? 1:2
-        // if(this.iconUp == 2){
-        // 	this.iconUp =1
-        // }
-        switch (this.iconUp) {
-          case 1:
-            this.iconUp = 2;
-            break;
-          case 0:
-            this.iconUp = 1;
-            break;
-          case 2:
-            this.iconUp = 1;
-            break;
-        }
-      } else {
-        this.iconUp = 0;
-      }
-    },
-    toDetail(item) {
-      console.log(item);
-      // return;
-      uni.navigateTo({
-        url: `/pageA/productdetails?id=${item.id}`,
-      });
-    },
+	import GoodsCard from "./component/goodsCard.vue";
+	export default {
+		components: {
+			GoodsCard,
+		},
+		data() {
+			return {
+				value: 4,
+				selectTab: 0,
+				iconUp: 0,
+				isShow: "2", //是否可关注
+				userId: "",
+				userInfo: {}, //用户信息
+				goodsList: [],
+				user_other: {},
+				user_other_no: "",
+				show: "",
+				page: 1,
+				last_page: 1
+			};
+		},
+		onLoad(option) {
+			if (option.page) {
+				this.isShow = option.page;
+			}
+			if (option.user_other) {
+				this.user_other = JSON.parse(decodeURIComponent(option.user_other));
+			}
+			this.show = option.show;
+			this.userId = option.merchant_id;
+			this.user_other_no = option.user_other_no;
+		},
+		onReachBottom() {
+			if (this.page < this.last_page) {
+				this.page++
+				this.getCommodityList()
+			} else {
+				this.$u.toast('已无更多数据')
+			}
+		},
+		methods: {
+			tochat() {
+				uni.navigateTo({
+					url: "/pageA/chat/chat?user_other=" +
+						encodeURIComponent(JSON.stringify(this.user_other)) +
+						"&user_other_no=" +
+						this.user_other_no,
+				});
+			},
+			switchTab(num) {
+				this.selectTab = num;
+				if (num == 4) {
+					// this.iconUp = this.iconUp == 0 ? 1:2
+					// if(this.iconUp == 2){
+					// 	this.iconUp =1
+					// }
+					switch (this.iconUp) {
+						case 1:
+							this.iconUp = 2;
+							break;
+						case 0:
+							this.iconUp = 1;
+							break;
+						case 2:
+							this.iconUp = 1;
+							break;
+					}
+				} else {
+					this.iconUp = 0;
+				}
+			},
+			toDetail(item) {
+				console.log(item);
+				// return;
+				uni.navigateTo({
+					url: `/pageA/productdetails?id=${item.id}`,
+				});
+			},
 
-    //关注 or 取消关注 店铺
-    followTeam(num) {
-      uni.$u.http
-        .post(`/api/interest/follow`, {
-          interest_type: 1,
-          interest_id: this.userInfo.id,
-        })
-        .then((res) => {
-          this.userInfo.is_interest = num;
-          uni.showToast({
-            title: !num ? "关注成功" : "取消关注",
-            icon: "none",
-          });
-        });
-    },
-    getCommodityList(status = "") {
-      //获取用户信息
-      uni.$u.http
-        .get(`/api/merchant/info?merchant_id=${this.userId}`)
-        .then((res) => {
-          this.userInfo = res;
-        });
+			//关注 or 取消关注 店铺
+			followTeam(num) {
+				uni.$u.http
+					.post(`/api/interest/follow`, {
+						interest_type: 1,
+						interest_id: this.userInfo.id,
+					})
+					.then((res) => {
+						this.userInfo.is_interest = num;
+						uni.showToast({
+							title: !num ? "关注成功" : "取消关注",
+							icon: "none",
+						});
+					});
+			},
+			getCommodityList(status = "") {
+				//获取用户信息
+				uni.$u.http
+					.get(`/api/merchant/info?merchant_id=${this.userId}`)
+					.then((res) => {
+						this.userInfo = res;
+					});
 
-      //获取店铺商品
-      uni.$u.http
-        .post(`/api/goods/merchant_goods`, {
-          page: 1,
-          limit: 10,
-          merchant_id: this.userId,
-          status: status,
-          keywords: this.keywords,
-          source: this.source,
-        })
-        .then((res) => {
-          this.goodsList = res.data;
-        });
-    },
-  },
-  mounted() {
-    this.getCommodityList();
-    //设置顶部导航栏颜色
-    uni.setNavigationBarColor({
-      frontColor: "#ffffff",
-      backgroundColor: "#f74639",
-    });
-  },
-};
+				//获取店铺商品
+				uni.$u.http
+					.post(`/api/goods/merchant_goods`, {
+						page: this.page,
+						limit: 10,
+						merchant_id: this.userId,
+						status: status,
+						keywords: this.keywords,
+						source: this.source,
+					})
+					.then((res) => {
+						this.last_page = res.last_page
+						if(this.page==1){
+							this.goodsList = res.data;
+						}else{
+							this.goodsList = this.goodsList.concat(res.data)
+						}
+					});
+			},
+		},
+		mounted() {
+			this.getCommodityList();
+			//设置顶部导航栏颜色
+			uni.setNavigationBarColor({
+				frontColor: "#ffffff",
+				backgroundColor: "#f74639",
+			});
+		},
+	};
 </script>
 
 <style lang="scss" scoped>
-.page {
-  .shadow {
-    position: absolute;
-    top: 0;
-    height: 300px;
-    width: 100%;
-    background: linear-gradient(#f74639, #f4f4f4);
-    z-index: -1;
-  }
+	.page {
+		.shadow {
+			position: absolute;
+			top: 0;
+			height: 300px;
+			width: 100%;
+			background: linear-gradient(#f74639, #f4f4f4);
+			z-index: -1;
+		}
 
-  .content {
-    padding: 20rpx 24rpx;
-    margin-top: 76rpx;
+		.content {
+			padding: 20rpx 24rpx;
+			margin-top: 76rpx;
 
-    .top-information {
-      position: relative;
-      border-radius: 20rpx;
-      background-color: #fff;
-      padding: 28rpx 24rpx;
+			.top-information {
+				position: relative;
+				border-radius: 20rpx;
+				background-color: #fff;
+				padding: 28rpx 24rpx;
 
-      ::v-deep .u-icon__icon {
-        color: #f83224 !important;
-      }
+				::v-deep .u-icon__icon {
+					color: #f83224 !important;
+				}
 
-      .user-header {
-        width: 164rpx;
-        height: 164rpx;
-        border-radius: 50%;
-        border: 2rpx solid #fff;
-        position: absolute;
-        top: -80rpx;
-        left: 28rpx;
-      }
+				.user-header {
+					width: 164rpx;
+					height: 164rpx;
+					border-radius: 50%;
+					border: 2rpx solid #fff;
+					position: absolute;
+					top: -80rpx;
+					left: 28rpx;
+				}
 
-      .btn-list {
-        display: flex;
-        align-items: center;
-        justify-content: flex-end;
-        height: 100rpx;
+				.btn-list {
+					display: flex;
+					align-items: center;
+					justify-content: flex-end;
+					height: 100rpx;
 
-        .btn-1 {
-          border: 2rpx solid #f83224;
-          background-color: #fff;
-          color: #f83224;
-          padding: 0;
-          margin: 0;
-          display: flex;
-          justify-content: space-around;
-          align-items: center;
-          height: 52rpx;
-          border-radius: 24rpx;
-          line-height: 52rpx;
-          font-size: 26rpx;
-          padding: 0 28rpx;
-          margin-left: 20rpx;
-        }
-      }
+					.btn-1 {
+						border: 2rpx solid #f83224;
+						background-color: #fff;
+						color: #f83224;
+						padding: 0;
+						margin: 0;
+						display: flex;
+						justify-content: space-around;
+						align-items: center;
+						height: 52rpx;
+						border-radius: 24rpx;
+						line-height: 52rpx;
+						font-size: 26rpx;
+						padding: 0 28rpx;
+						margin-left: 20rpx;
+					}
+				}
 
-      .name {
-        margin-top: 28rpx;
-        font-weight: 600;
-        font-size: 32rpx;
-        color: #333333;
-      }
+				.name {
+					margin-top: 28rpx;
+					font-weight: 600;
+					font-size: 32rpx;
+					color: #333333;
+				}
 
-      .score {
-        width: 30%;
-        height: 28rpx;
-        background-color: rgba(255, 27, 0, 0.1);
-        display: flex;
-        border-radius: 12rpx;
-        margin-top: 16rpx;
-        justify-content: space-around;
+				.score {
+					width: 30%;
+					height: 28rpx;
+					background-color: rgba(255, 27, 0, 0.1);
+					display: flex;
+					border-radius: 12rpx;
+					margin-top: 16rpx;
+					justify-content: space-around;
 
-        .num {
-          font-size: 22rpx;
-          color: #ff1515;
-          font-weight: 600;
-        }
-      }
+					.num {
+						font-size: 22rpx;
+						color: #ff1515;
+						font-weight: 600;
+					}
+				}
 
-      .sale {
-        display: flex;
-        align-items: center;
-        font-size: 24rpx;
-        color: #777;
-        margin-top: 20rpx;
+				.sale {
+					display: flex;
+					align-items: center;
+					font-size: 24rpx;
+					color: #777;
+					margin-top: 20rpx;
 
-        .shu {
-          font-size: 16rpx;
-          color: #979797;
-          opacity: 0.2;
-        }
-      }
-    }
-  }
+					.shu {
+						font-size: 16rpx;
+						color: #979797;
+						opacity: 0.2;
+					}
+				}
+			}
+		}
 
-  .goods-list {
-    border-radius: 20rpx;
-    background-color: #fff;
-    padding: 0 20rpx;
-    margin-top: 20rpx;
+		.goods-list {
+			border-radius: 20rpx;
+			background-color: #fff;
+			padding: 0 20rpx;
+			margin-top: 20rpx;
 
-    .tab-list {
-      height: 96rpx;
-      display: flex;
-      justify-content: space-around;
-      align-items: center;
-      font-size: 26rpx;
-      color: #333333;
-      border-bottom: 2rpx solid rgba(151, 151, 151, 0.1);
-      margin-bottom: 20rpx;
+			.tab-list {
+				height: 96rpx;
+				display: flex;
+				justify-content: space-around;
+				align-items: center;
+				font-size: 26rpx;
+				color: #333333;
+				border-bottom: 2rpx solid rgba(151, 151, 151, 0.1);
+				margin-bottom: 20rpx;
 
-      .tab {
-        color: #000;
-        font-weight: 600;
-      }
+				.tab {
+					color: #000;
+					font-weight: 600;
+				}
 
-      .price {
-        display: flex;
-        align-items: center;
-      }
-    }
+				.price {
+					display: flex;
+					align-items: center;
+				}
+			}
 
-    .goods {
-      display: flex;
-      flex-wrap: wrap;
-      justify-content: space-between;
-    }
-  }
-}
-</style>
+			.goods {
+				display: flex;
+				flex-wrap: wrap;
+				justify-content: space-between;
+			}
+		}
+	}
+</style>

pages/index/index.vue

@@ -285,8 +285,7 @@
 				this.current = options.current
 			}
 			//商品推荐
-			
-			
+			this.getlista()
 		},
 		onShow() {
 			this.config()
@@ -305,6 +304,14 @@
 			this.HXlogin()
 		},
 		methods: {
+			//获取快递列表
+			getlista() {
+				uni.$u.http.get('/api/express-company', {}).then((res) => {
+					uni.setStorageSync('radiolist1',res)
+				}).catch(() => {
+			
+				})
+			},
 			HXlogin() {
 				if (uni.getStorageSync('user_no') && uni.getStorageSync('pwd')) {
 					var user_no = uni.getStorageSync('user_no')

unpackage/dist/build/mp-weixin/pageA/comment.wxml

@@ -1 +1 @@
-<view class="back data-v-2a6088c1"><block wx:if="{{$root.g0>0}}"><view class="data-v-2a6088c1"><block wx:for="{{$root.l1}}" wx:for-item="item" wx:for-index="idx" wx:key="idx"><view class="box data-v-2a6088c1"><view style="display:flex;justify-content:space-between;" class="data-v-2a6088c1"><view class="u-flex data-v-2a6088c1"><image style="width:68rpx;height:68rpx;border:radius 34rpx;" src="{{item.$orig.member.avatar}}" mode class="data-v-2a6088c1"></image><view class="data-v-2a6088c1"><text class="name data-v-2a6088c1">{{item.g1+'***'+item.g2}}</text><uni-rate bind:input="__e" vue-id="{{'cf029f7c-1-'+idx}}" network="{{true}}" allow-half="{{true}}" readonly="{{true}}" color="rgba(247, 181, 0, 1)" size="{{8}}" value="{{rate}}" data-event-opts="{{[['^input',[['__set_model',['','rate','$event',[]]]]]]}}" class="data-v-2a6088c1" bind:__l="__l"></uni-rate></view></view><text class="day data-v-2a6088c1">{{item.m0}}</text></view><view class="day data-v-2a6088c1" style="margin-top:24rpx;">{{item.$orig.sku_item.item}}</view><view class="content data-v-2a6088c1" style="margin-top:20rpx;">{{item.$orig.content}}</view><block wx:if="{{item.$orig.image||item.$orig.video}}"><view class="u-flex u-row-between data-v-2a6088c1" style="margin-top:22rpx;flex-wrap:wrap;"><video style="margin-bottom:20rpx;width:326rpx;height:326rpx;border-radius:12rpx;" src="{{item.$orig.video}}" class="data-v-2a6088c1"></video><block wx:for="{{item.l0}}" wx:for-item="child" wx:for-index="index" wx:key="index"><image style="margin-bottom:20rpx;width:326rpx;height:326rpx;border-radius:12rpx;background:#D8D8D8;" src="{{child}}" mode class="data-v-2a6088c1"></image></block></view></block></view></block></view></block><block wx:else><view style="height:400rpx;text-align:center;line-height:400rpx;" class="data-v-2a6088c1">{{''+i18n.nodata+''}}</view></block></view>
+<view class="back data-v-8f03207e"><block wx:if="{{$root.g0>0}}"><view class="data-v-8f03207e"><block wx:for="{{$root.l1}}" wx:for-item="item" wx:for-index="idx" wx:key="idx"><view class="box data-v-8f03207e"><view style="display:flex;justify-content:space-between;" class="data-v-8f03207e"><view class="u-flex data-v-8f03207e"><image style="width:68rpx;height:68rpx;border-radius:50%;" src="{{item.$orig.member.avatar}}" mode class="data-v-8f03207e"></image><view class="u-flex-column u-row-between data-v-8f03207e" style="margin-left:20rpx;height:68rpx;"><text class="name data-v-8f03207e">{{item.g1+'***'+item.g2}}</text><uni-rate vue-id="{{'cf029f7c-1-'+idx}}" max="{{5}}" value="{{item.$orig.score}}" readonly="{{true}}" size="{{8}}" class="data-v-8f03207e" bind:__l="__l"></uni-rate></view></view><text class="day data-v-8f03207e">{{item.m0}}</text></view><view class="day data-v-8f03207e" style="margin-top:24rpx;">{{item.$orig.sku_item.item}}</view><view class="content data-v-8f03207e" style="margin-top:20rpx;">{{item.$orig.content}}</view><block wx:if="{{item.$orig.image||item.$orig.video}}"><view class="u-flex u-row-between data-v-8f03207e" style="margin-top:22rpx;flex-wrap:wrap;"><video style="margin-bottom:20rpx;width:326rpx;height:326rpx;border-radius:12rpx;" src="{{item.$orig.video}}" class="data-v-8f03207e"></video><block wx:for="{{item.l0}}" wx:for-item="child" wx:for-index="index" wx:key="index"><image style="margin-bottom:20rpx;width:326rpx;height:326rpx;border-radius:12rpx;background:#D8D8D8;" src="{{child}}" mode class="data-v-8f03207e"></image></block></view></block></view></block></view></block><block wx:else><view style="height:400rpx;text-align:center;line-height:400rpx;" class="data-v-8f03207e">{{''+i18n.nodata+''}}</view></block></view>

unpackage/dist/build/mp-weixin/pageA/comment.wxss

@@ -1 +1 @@
-.back.data-v-2a6088c1{padding:20rpx;box-sizing:border-box}.back .box.data-v-2a6088c1{background:#fff;border-radius:16rpx;padding:24rpx 20rpx;box-sizing:border-box;margin-bottom:20rpx}.back .day.data-v-2a6088c1{font-family:SFPro;font-weight:400;font-size:20rpx;color:#9e9e9e;line-height:24rpx;text-align:justify;font-style:normal}.back .content.data-v-2a6088c1{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:26rpx;color:#444;line-height:36rpx;text-align:justify;font-style:normal}.back .name.data-v-2a6088c1{font-family:PingFangSC,PingFang SC;font-weight:500;font-size:22rpx;color:#444;line-height:32rpx;text-align:left;font-style:normal;margin-bottom:34rpx}
+.back.data-v-8f03207e{padding:20rpx;box-sizing:border-box}.back .box.data-v-8f03207e{background:#fff;border-radius:16rpx;padding:24rpx 20rpx;box-sizing:border-box;margin-bottom:20rpx}.back .day.data-v-8f03207e{font-family:SFPro;font-weight:400;font-size:20rpx;color:#9e9e9e;line-height:24rpx;text-align:justify;font-style:normal}.back .content.data-v-8f03207e{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:26rpx;color:#444;line-height:36rpx;text-align:justify;font-style:normal}.back .name.data-v-8f03207e{font-family:PingFangSC,PingFang SC;font-weight:500;font-size:22rpx;color:#444;line-height:32rpx;text-align:left;font-style:normal;margin-bottom:34rpx}

unpackage/dist/build/mp-weixin/pageD/afterSalesDetail/afterSalesDetail.wxss

@@ -1 +1 @@
-.page.data-v-1e3019fe{padding:20rpx 24rpx;position:relative}.page .top.data-v-1e3019fe{background-color:#fff;border-radius:16rpx;padding:28rpx 20rpx}.page .top .top-title.data-v-1e3019fe{font-size:36rpx;color:#333;font-weight:600}.page .top .top-detail.data-v-1e3019fe{font-size:26rpx;color:#a3a3a3;margin-top:10rpx}.page .address.data-v-1e3019fe{background-color:#fff;border-radius:16rpx;padding:34rpx 24rpx 28rpx;margin-top:24rpx}.page .address .name-phone.data-v-1e3019fe{display:flex;align-items:center;align-items:flex-end}.page .address .name-phone .phone.data-v-1e3019fe{font-size:26rpx;color:#666}.page .address .address-detail.data-v-1e3019fe{margin-top:20rpx;font-size:24rpx;color:#444}.page .footer.data-v-1e3019fe{position:fixed;bottom:0;left:0;width:100%;background-color:#fff;height:146rpx;display:flex;justify-content:flex-end;padding:20rpx 20rpx 0 0}.page .footer .btn-1.data-v-1e3019fe{height:76rpx;padding:0;margin:0;font-size:28rpx;color:#f83224;min-width:188rpx;background-color:#fff;border-radius:38rpx;border:2rpx solid #f83224;margin-right:20rpx}.page .footer .btn-2.data-v-1e3019fe{height:76rpx;padding:0;margin:0;font-size:28rpx;color:#fff;min-width:188rpx;background-color:#f83224;border-radius:38rpx;margin-right:20rpx}
+.page.data-v-16e86283{padding:20rpx 24rpx;position:relative}.page .top.data-v-16e86283{background-color:#fff;border-radius:16rpx;padding:28rpx 20rpx}.page .top .top-title.data-v-16e86283{font-size:36rpx;color:#333;font-weight:600}.page .top .top-detail.data-v-16e86283{font-size:26rpx;color:#a3a3a3;margin-top:10rpx}.page .address.data-v-16e86283{background-color:#fff;border-radius:16rpx;padding:34rpx 24rpx 28rpx;margin-top:24rpx}.page .address .name-phone.data-v-16e86283{display:flex;align-items:center;align-items:flex-end}.page .address .name-phone .phone.data-v-16e86283{font-size:26rpx;color:#666}.page .address .address-detail.data-v-16e86283{margin-top:20rpx;font-size:24rpx;color:#444}.page .footer.data-v-16e86283{position:fixed;bottom:0;left:0;width:100%;background-color:#fff;height:146rpx;display:flex;justify-content:flex-end;padding:20rpx 20rpx 0 0}.page .footer .btn-1.data-v-16e86283{height:76rpx;padding:0;margin:0;font-size:28rpx;color:#f83224;min-width:188rpx;background-color:#fff;border-radius:38rpx;border:2rpx solid #f83224;margin-right:20rpx}.page .footer .btn-2.data-v-16e86283{height:76rpx;padding:0;margin:0;font-size:28rpx;color:#fff;min-width:188rpx;background-color:#f83224;border-radius:38rpx;margin-right:20rpx}

unpackage/dist/build/mp-weixin/pageD/afterSalesManage/component/detailCard.js

@@ -1,4 +1,4 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageD/afterSalesManage/component/detailCard"],{"34a9":function(t,e,n){"use strict";n.r(e);var o=n("be54"),a=n("3c0a");for(var i in a)["default"].indexOf(i)<0&&function(t){n.d(e,t,(function(){return a[t]}))}(i);n("afef");var u,r=n("f0c5"),f=Object(r["a"])(a["default"],o["b"],o["c"],!1,null,"582dc4c4",null,!1,o["a"],u);e["default"]=f.exports},"3c0a":function(t,e,n){"use strict";n.r(e);var o=n("65b3"),a=n.n(o);for(var i in o)["default"].indexOf(i)<0&&function(t){n.d(e,t,(function(){return o[t]}))}(i);e["default"]=a.a},"65b3":function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var o={props:{itemInfo:{typeof:Object,default:{}}},computed:{model:function(){if(0==this.itemInfo.status)return"filter: blur(5px);"},deliveryStatus:function(){return"0"==this.itemInfo.status?"待退款":"3"==this.itemInfo.status?"平台介入":"2"==this.itemInfo.status?"拒绝退款":"1"==this.itemInfo.status?"已退款":void 0}},data:function(){return{}}};e.default=o},a3a5:function(t,e,n){},afef:function(t,e,n){"use strict";var o=n("a3a5"),a=n.n(o);a.a},be54:function(t,e,n){"use strict";var o;n.d(e,"b",(function(){return a})),n.d(e,"c",(function(){return i})),n.d(e,"a",(function(){return o}));var a=function(){var t=this,e=t.$createElement,n=(t._self._c,t.itemInfo.goods.price.split(".")),o=t.itemInfo.goods.price.split("."),a=t.itemInfo.order_goods.total_amount.toFixed(2).split("."),i=t.itemInfo.order_goods.total_amount.toFixed(2).split(".");t.$mp.data=Object.assign({},{$root:{g0:n,g1:o,g2:a,g3:i}})},i=[]}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageD/afterSalesManage/component/detailCard"],{"34a9":function(t,e,n){"use strict";n.r(e);var o=n("bfc0"),i=n("3c0a");for(var a in i)["default"].indexOf(a)<0&&function(t){n.d(e,t,(function(){return i[t]}))}(a);n("aa01");var u,s=n("f0c5"),f=Object(s["a"])(i["default"],o["b"],o["c"],!1,null,"93033bbc",null,!1,o["a"],u);e["default"]=f.exports},"3c0a":function(t,e,n){"use strict";n.r(e);var o=n("65b3"),i=n.n(o);for(var a in o)["default"].indexOf(a)<0&&function(t){n.d(e,t,(function(){return o[t]}))}(a);e["default"]=i.a},"3ca6":function(t,e,n){},"65b3":function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var o={props:{itemInfo:{typeof:Object,default:{}}},computed:{model:function(){if(0==this.itemInfo.status)return"filter: blur(5px);"},deliveryStatus:function(){return"0"==this.itemInfo.status?"待退款":"3"==this.itemInfo.status?"平台介入":"2"==this.itemInfo.status?"拒绝退款":"1"==this.itemInfo.status?"已退款":void 0}},data:function(){return{}}};e.default=o},aa01:function(t,e,n){"use strict";var o=n("3ca6"),i=n.n(o);i.a},bfc0:function(t,e,n){"use strict";var o;n.d(e,"b",(function(){return i})),n.d(e,"c",(function(){return a})),n.d(e,"a",(function(){return o}));var i=function(){var t=this,e=t.$createElement,n=(t._self._c,t.itemInfo.goods.price.split(".")),o=t.itemInfo.goods.price.split("."),i=t.itemInfo.order_goods.total_amount.toFixed(2).split("."),a=t.itemInfo.order_goods.total_amount.toFixed(2).split("."),u=(0==t.itemInfo.status||3==t.itemInfo.status)&&Number(t.itemInfo.is_send),s=(0==t.itemInfo.status||3==t.itemInfo.status)&&Number(t.itemInfo.is_send);t.$mp.data=Object.assign({},{$root:{g0:n,g1:o,g2:i,g3:a,m0:u,m1:s}})},a=[]}}]);
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'pageD/afterSalesManage/component/detailCard-create-component',
     {

unpackage/dist/build/mp-weixin/pageD/evaluate/evaluate.wxml

@@ -1 +1 @@
-<view class="data-v-4d48263a"><block wx:for="{{orderDetail.goods}}" wx:for-item="item" wx:for-index="__i0__"><view class="content data-v-4d48263a"><view class="goods-title data-v-4d48263a"><image class="goods-img data-v-4d48263a" src="{{item.goods_image}}" mode="scaleToFill"></image><view class="title data-v-4d48263a">{{''+item.goods_name+''}}</view></view><view class="rate data-v-4d48263a"><view class="_label data-v-4d48263a">商品评价</view><u-rate bind:input="__e" vue-id="{{'4a6a8fa2-1-'+__i0__}}" count="{{count}}" size="22" value="{{value}}" data-event-opts="{{[['^input',[['__set_model',['','value','$event',[]]]]]]}}" class="data-v-4d48263a" bind:__l="__l"></u-rate></view><u-upload vue-id="{{'4a6a8fa2-2-'+__i0__}}" fileList="{{fileList1}}" name="1" multiple="{{true}}" maxCount="{{10}}" accept="all" data-event-opts="{{[['^afterRead',[['afterRead']]],['^delete',[['deletePic']]]]}}" bind:afterRead="__e" bind:delete="__e" class="data-v-4d48263a" bind:__l="__l" vue-slots="{{['default']}}"><view class="upload-photo data-v-4d48263a"><u-icon vue-id="{{('4a6a8fa2-3-'+__i0__)+','+('4a6a8fa2-2-'+__i0__)}}" name="camera" size="26" class="data-v-4d48263a" bind:__l="__l"></u-icon><text class="data-v-4d48263a">添加图片/视频</text></view></u-upload><view class="_text data-v-4d48263a"><u--textarea bind:input="__e" vue-id="{{'4a6a8fa2-4-'+__i0__}}" border="none" height="150" placeholder="展开说说对商品的想法" value="{{value1}}" data-event-opts="{{[['^input',[['__set_model',['','value1','$event',[]]]]]]}}" class="data-v-4d48263a" bind:__l="__l"></u--textarea></view></view></block><button data-event-opts="{{[['tap',[['submit',['$event']]]]]}}" class="btn-1 data-v-4d48263a" bindtap="__e">提交评价</button></view>
+<view class="data-v-234c9002"><block wx:for="{{orderDetail.goods}}" wx:for-item="item" wx:for-index="__i0__"><view class="content data-v-234c9002"><view class="goods-title data-v-234c9002"><image class="goods-img data-v-234c9002" src="{{item.goods_image}}" mode="scaleToFill"></image><view class="title data-v-234c9002">{{''+item.goods_name+''}}</view></view><view class="rate data-v-234c9002"><view class="_label data-v-234c9002">商品评价</view><u-rate bind:input="__e" vue-id="{{'4a6a8fa2-1-'+__i0__}}" count="{{count}}" size="22" value="{{value}}" data-event-opts="{{[['^input',[['__set_model',['','value','$event',[]]]]]]}}" class="data-v-234c9002" bind:__l="__l"></u-rate></view><u-upload vue-id="{{'4a6a8fa2-2-'+__i0__}}" fileList="{{fileList1}}" name="1" multiple="{{true}}" maxCount="{{10}}" data-event-opts="{{[['^afterRead',[['afterRead']]],['^delete',[['deletePic']]]]}}" bind:afterRead="__e" bind:delete="__e" class="data-v-234c9002" bind:__l="__l" vue-slots="{{['default']}}"><view class="upload-photo data-v-234c9002"><u-icon vue-id="{{('4a6a8fa2-3-'+__i0__)+','+('4a6a8fa2-2-'+__i0__)}}" name="camera" size="26" class="data-v-234c9002" bind:__l="__l"></u-icon><text class="data-v-234c9002">添加图片/视频</text></view></u-upload><view class="_text data-v-234c9002"><u--textarea bind:input="__e" vue-id="{{'4a6a8fa2-4-'+__i0__}}" border="none" height="150" placeholder="展开说说对商品的想法" value="{{value1}}" data-event-opts="{{[['^input',[['__set_model',['','value1','$event',[]]]]]]}}" class="data-v-234c9002" bind:__l="__l"></u--textarea></view></view></block><button data-event-opts="{{[['tap',[['submit',['$event']]]]]}}" class="btn-1 data-v-234c9002" bindtap="__e">提交评价</button></view>

unpackage/dist/build/mp-weixin/pageD/evaluate/evaluate.wxss

@@ -1 +1 @@
-.content.data-v-4d48263a{background-color:#fff;padding:40rpx 24rpx}.content .goods-title.data-v-4d48263a{display:flex;justify-content:flex-start;align-items:center}.content .goods-title .goods-img.data-v-4d48263a{width:52rpx;height:52rpx;border-radius:6rpx}.content .goods-title .title.data-v-4d48263a{font-size:24rpx;color:rgba(51,51,51,.5);margin-left:20rpx}.content .rate.data-v-4d48263a{display:flex;align-items:center;margin-bottom:20rpx}.content .rate ._label.data-v-4d48263a{font-size:32rpx;font-weight:600;margin-right:22rpx}.content ._text.data-v-4d48263a{margin-top:32rpx;padding-top:26rpx;border-top:2rpx solid hsla(0,0%,59.2%,.1)}.content .upload-photo.data-v-4d48263a{width:180rpx;height:180rpx;border:2rpx dashed #979797;border-radius:8rpx;display:flex;align-items:center;flex-direction:column;justify-content:center;font-size:24rpx;color:rgba(34,34,34,.8)}.content.data-v-4d48263a  .u-textarea{background-color:#fff}.btn-1.data-v-4d48263a{background-color:#f83224;color:#fff;border-radius:40rpx;height:80rpx;line-height:80rpx;width:90%;margin:0 auto;margin-top:70rpx;font-size:32rpx}
+.content.data-v-234c9002{background-color:#fff;padding:40rpx 24rpx}.content .goods-title.data-v-234c9002{display:flex;justify-content:flex-start;align-items:center}.content .goods-title .goods-img.data-v-234c9002{width:52rpx;height:52rpx;border-radius:6rpx}.content .goods-title .title.data-v-234c9002{font-size:24rpx;color:rgba(51,51,51,.5);margin-left:20rpx}.content .rate.data-v-234c9002{display:flex;align-items:center;margin-bottom:20rpx}.content .rate ._label.data-v-234c9002{font-size:32rpx;font-weight:600;margin-right:22rpx}.content ._text.data-v-234c9002{margin-top:32rpx;padding-top:26rpx;border-top:2rpx solid hsla(0,0%,59.2%,.1)}.content .upload-photo.data-v-234c9002{width:180rpx;height:180rpx;border:2rpx dashed #979797;border-radius:8rpx;display:flex;align-items:center;flex-direction:column;justify-content:center;font-size:24rpx;color:rgba(34,34,34,.8)}.content.data-v-234c9002  .u-textarea{background-color:#fff}.btn-1.data-v-234c9002{background-color:#f83224;color:#fff;border-radius:40rpx;height:80rpx;line-height:80rpx;width:90%;margin:0 auto;margin-top:70rpx;font-size:32rpx}

unpackage/dist/build/mp-weixin/pages/mine/component/mineMoney.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

unpackage/dist/build/mp-weixin/pages/mine/component/personalFunction.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

unpackage/dist/dev/mp-weixin/pageB/Senderinfor.wxml

@@ -1 +1 @@
-<view class="back"><view class="info"><view class="item u-flex u-row-between"><text class="title">{{i18n.senderinfo}}</text><view class="u-flex"><u-icon vue-id="a383861e-1" name="order" color="rgba(0, 0, 0, 0.6)" size="23" bind:__l="__l"></u-icon><text class="wx">{{i18n.wxAddress}}</text></view></view><view class="item u-flex"><text class="left">{{i18n.name}}</text><view class="right"><input type="text" placeholder="{{i18n.Fill}}"/></view></view><view class="item u-flex"><text class="left">{{i18n.phone}}</text><view class="right"><input type="text" placeholder="{{i18n.Fill}}"/></view></view><view class="item u-flex"><text class="left">{{i18n.city}}</text><view class="right"><input type="text" placeholder="{{i18n.selection}}" disabled/></view></view><view class="item u-flex"><text class="left">{{i18n.detailed}}</text><view class="right"><input type="area" placeholder="{{i18n.Fill}}" disabled/></view></view><view class="item u-flex"><input type="area" placeholder="{{i18n.company}}"/></view><view class="u-flex u-row-between" style="margin-top:22rpx;"><view class="u-flex"><view><u-checkbox-group vue-id="a383861e-2" placement="row" value="{{checkboxValue1}}" data-event-opts="{{[['^change',[['checkboxChange']]],['^input',[['__set_model',['','checkboxValue1','$event',[]]]]]]}}" bind:change="__e" bind:input="__e" bind:__l="__l" vue-slots="{{['default']}}"><u-checkbox vue-id="{{('a383861e-3')+','+('a383861e-2')}}" shape="circle" customStyle="{{({marginRight:'4px'})}}" name="{{name}}" bind:__l="__l"></u-checkbox></u-checkbox-group></view><text class="clear">{{i18n.initial}}</text></view><text class="clear">{{''+i18n.empty+''}}</text></view></view><view class="history">{{i18n.history}}</view><view class="add"><view><text class="name">陈盼盼</text><text class="phone">176****3298</text></view><view class="addinfo">江苏省南京市浦口区浦口大道东方万汇城北区</view></view><view class="bottom"><view class="btn">{{''+i18n.enter+''}}</view></view></view>
+<view class="back"><view class="info"><view class="item u-flex u-row-between"><text class="title">{{i18n.senderinfo}}</text><view class="u-flex"><u-icon vue-id="a383861e-1" name="order" color="rgba(0, 0, 0, 0.6)" size="23" bind:__l="__l"></u-icon><text class="wx">{{i18n.wxAddress}}</text></view></view><view class="item u-flex "><text class="left">{{i18n.name}}</text><view class="right"><input type="text" placeholder="{{i18n.Fill}}"/></view></view><view class="item u-flex "><text class="left">{{i18n.phone}}</text><view class="right"><input type="text" placeholder="{{i18n.Fill}}"/></view></view><view class="item u-flex "><text class="left">{{i18n.city}}</text><view class="right"><input type="text" placeholder="{{i18n.selection}}" disabled/></view></view><view class="item u-flex "><text class="left">{{i18n.detailed}}</text><view class="right"><input type="area" placeholder="{{i18n.Fill}}" disabled/></view></view><view class="item u-flex "><input type="area" placeholder="{{i18n.company}}"/></view><view class="u-flex u-row-between" style="margin-top:22rpx;"><view class="u-flex"><view><u-checkbox-group vue-id="a383861e-2" placement="row" value="{{checkboxValue1}}" data-event-opts="{{[['^change',[['checkboxChange']]],['^input',[['__set_model',['','checkboxValue1','$event',[]]]]]]}}" bind:change="__e" bind:input="__e" bind:__l="__l" vue-slots="{{['default']}}"><u-checkbox vue-id="{{('a383861e-3')+','+('a383861e-2')}}" shape="circle" customStyle="{{({marginRight:'4px'})}}" name="{{name}}" bind:__l="__l"></u-checkbox></u-checkbox-group></view><text class="clear">{{i18n.initial}}</text></view><text class="clear">{{''+i18n.empty+''}}</text></view></view><view class="history">{{i18n.history}}</view><view class="add"><view><text class="name">陈盼盼</text><text class="phone">176****3298</text></view><view class="addinfo">江苏省南京市浦口区浦口大道东方万汇城北区</view></view><view class="bottom"><view class="btn">{{''+i18n.enter+''}}</view></view></view>

unpackage/dist/dev/mp-weixin/pageB/expresstype.wxml

@@ -1 +1 @@
-<view class="box data-v-4b31f8e0"><view class="exp data-v-4b31f8e0"><u-radio-group vue-id="7279ef76-1" placement="column" value="{{radiovalue1}}" data-event-opts="{{[['^change',[['groupChange']]],['^input',[['__set_model',['','radiovalue1','$event',[]]]]]]}}" bind:change="__e" bind:input="__e" class="data-v-4b31f8e0" bind:__l="__l" vue-slots="{{['default']}}"><block wx:for="{{radiolist1}}" wx:for-item="item" wx:for-index="idx" wx:key="idx"><view class="item u-flex u-row-between data-v-4b31f8e0"><text class="data-v-4b31f8e0">{{item.name}}</text><u-radio vue-id="{{('7279ef76-2-'+idx)+','+('7279ef76-1')}}" name="{{item.name}}" data-event-opts="{{[['^change',[['radioChange',['$0'],[[['radiolist1','',idx]]]]]]]}}" bind:change="__e" class="data-v-4b31f8e0" bind:__l="__l"></u-radio></view></block></u-radio-group></view><view class="bottom data-v-4b31f8e0"><view data-event-opts="{{[['tap',[['toteach',['$event']]]]]}}" class="btn data-v-4b31f8e0" bindtap="__e">{{''+i18n.enter+''}}</view></view></view>
+<view class="box data-v-4b31f8e0"><view class="exp data-v-4b31f8e0"><u-radio-group vue-id="7279ef76-1" placement="column" value="{{radiovalue1}}" data-event-opts="{{[['^change',[['groupChange']]],['^input',[['__set_model',['','radiovalue1','$event',[]]]]]]}}" bind:change="__e" bind:input="__e" class="data-v-4b31f8e0" bind:__l="__l" vue-slots="{{['default']}}"><block wx:for="{{radiolist1}}" wx:for-item="item" wx:for-index="idx" wx:key="idx"><block wx:if="{{idx<page}}"><view class="item u-flex u-row-between data-v-4b31f8e0"><text class="data-v-4b31f8e0">{{item.name}}</text><u-radio vue-id="{{('7279ef76-2-'+idx)+','+('7279ef76-1')}}" name="{{item.name}}" data-event-opts="{{[['^change',[['radioChange',['$0'],[[['radiolist1','',idx]]]]]]]}}" bind:change="__e" class="data-v-4b31f8e0" bind:__l="__l"></u-radio></view></block></block></u-radio-group></view><view class="bottom data-v-4b31f8e0"><view data-event-opts="{{[['tap',[['toteach',['$event']]]]]}}" class="btn data-v-4b31f8e0" bindtap="__e">{{''+i18n.enter+''}}</view></view></view>

unpackage/dist/dev/mp-weixin/pageB/parcel.wxml

@@ -1 +1 @@
-<view class="back data-v-245043da"><view class="box data-v-245043da" style="border-radius:16rpx 16rpx 0 0;"><view class="boxitem u-flex data-v-245043da"><text class="name data-v-245043da">{{i18n.TrackingNumber}}</text><input style="flex:1;" type="text" placeholder="{{i18n.trackingNumber}}" data-event-opts="{{[['input',[['__set_model',['','logistics_no','$event',[]]]]]]}}" value="{{logistics_no}}" bindinput="__e" class="data-v-245043da"/></view></view><view class="box data-v-245043da"><view class="boxitem u-flex data-v-245043da"><text class="name data-v-245043da">{{i18n.Expresscompany}}</text><input style="flex:1;" type="text" placeholder="{{i18n.ExpressCompany}}" data-event-opts="{{[['input',[['__set_model',['','logistics_company_name','$event',[]]]]]]}}" value="{{logistics_company_name}}" bindinput="__e" class="data-v-245043da"/></view></view><view class="box data-v-245043da" style="border-radius:0 0 16rpx 16rpx;"><view class="boxitem u-flex data-v-245043da"><text class="name data-v-245043da">{{i18n.Parcelweight}}</text><input style="flex:1;" type="text" placeholder="{{i18n.parcelWeight}}" data-event-opts="{{[['input',[['__set_model',['','estimated_weight','$event',[]]]]]]}}" value="{{estimated_weight}}" bindinput="__e" class="data-v-245043da"/><text class="data-v-245043da">kg</text></view></view><view data-event-opts="{{[['tap',[['offline',['$event']]]]]}}" class="btn data-v-245043da" bindtap="__e">{{''+i18n.Addlist+''}}</view></view>
+<view class="back data-v-245043da"><view class="box data-v-245043da" style="border-radius:16rpx 16rpx 0 0;"><view class="boxitem u-flex data-v-245043da"><text class="name data-v-245043da">{{i18n.TrackingNumber}}</text><input style="flex:1;" type="text" placeholder="{{i18n.trackingNumber}}" data-event-opts="{{[['input',[['__set_model',['','logistics_no','$event',[]]]]]]}}" value="{{logistics_no}}" bindinput="__e" class="data-v-245043da"/></view></view><view class="box data-v-245043da"><view class="boxitem u-flex u-row-between data-v-245043da"><text class="name data-v-245043da">{{i18n.Expresscompany}}</text><view data-event-opts="{{[['tap',[['toexpress',['$event']]]]]}}" class="u-flex data-v-245043da" bindtap="__e"><view class="selection data-v-245043da">{{logistics_company_name||i18n.selection}}</view><image style="width:30rpx;height:30rpx;" src="../static/express/next1.png" mode class="data-v-245043da"></image></view></view></view><view class="box data-v-245043da" style="border-radius:0 0 16rpx 16rpx;"><view class="boxitem u-flex u-row-end data-v-245043da"><text class="name data-v-245043da">{{i18n.Parcelweight}}</text><input style="flex:1;" type="text" placeholder="{{i18n.parcelWeight}}" data-event-opts="{{[['input',[['__set_model',['','estimated_weight','$event',[]]]]]]}}" value="{{estimated_weight}}" bindinput="__e" class="data-v-245043da"/><text class="data-v-245043da">kg</text></view></view><view data-event-opts="{{[['tap',[['offline',['$event']]]]]}}" class="btn data-v-245043da" bindtap="__e">{{''+i18n.Addlist+''}}</view></view>

unpackage/dist/dev/mp-weixin/pageB/parcel.wxss

@@ -24,6 +24,15 @@
 /* 垂直间距 */
 /* 透明度 */
 /* 文章场景相关 */
+.selection.data-v-245043da {
+  font-family: PingFangSC, PingFang SC;
+  font-weight: 400;
+  font-size: 28rpx;
+  color: #666666;
+  line-height: 40rpx;
+  text-align: left;
+  font-style: normal;
+}
 .btn.data-v-245043da {
   width: 686rpx;
   height: 88rpx;

unpackage/dist/dev/mp-weixin/pages/mine/component/mallOrderForm.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

unpackage/dist/dev/mp-weixin/pages/mine/component/mineMoney.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

unpackage/dist/dev/mp-weixin/pages/mine/component/personalFunction.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

unpackage/dist/dev/mp-weixin/pages/mine/component/teamFunction.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

unpackage/dist/dev/mp-weixin/uni_modules/lime-painter/components/l-painter-image/l-painter-image.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

unpackage/dist/dev/mp-weixin/uni_modules/lime-painter/components/l-painter/l-painter.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }