Merge branch 'master' of http://git.cc-lotus.info/pointToNetwork/point-app

pagesHome/group/group.vue

@@ -26,12 +26,8 @@
 								<view class="list_1_2">
 									<view class="goods">
 										<view class="goods_1">
-											<image class="image" v-if="item.spec.file&&item.spec.file.length>0"
-												:src="item.spec.file&&item.spec.file.length>0?item.spec.file[0].url:''"
-												mode=""></image>
-											<image class="image" v-else
-												:src="item.goods.file&&item.goods.file.length>0?item.goods.file[0].url:''"
-												mode=""></image>
+											<image class="image" v-if="item.spec.file&&item.spec.file.length>0" :src="item.spec.file&&item.spec.file.length>0?item.spec.file[0].url:''" mode=""></image>
+											<image class="image" v-else :src="item.goods.file&&item.goods.file.length>0?item.goods.file[0].url:''" mode=""></image>
 										</view>
 										<view class="goods_2">
 											<view class="goodsname textOver">
@@ -117,16 +113,16 @@
 				}
 			};
 		},
-		onLoad: function(e) {
+		onLoad: async function(e) {
 			const that = this;
 			that.searchConfig();
-		},
-		onShow: async function(e) {
-			const that = this;
 			await that.searchOther();
 			await that.watchlogin();
 			await that.search();
 		},
+		onShow: async function(e) {
+			const that = this;
+		},
 		onPullDownRefresh: async function() {
 			const that = this;
 			that.clearPage();
@@ -206,7 +202,7 @@
 			// 参加团购
 			toJion(e) {
 				const that = this;
-				that.clearPage();
+				// that.clearPage();
 				uni.navigateTo({
 					url: `/pagesHome/group/share?id=${e.goods._id}&group=${e._id}`
 				})
@@ -397,9 +393,10 @@
 									font-size: 14px;
 									color: #858585;
 								}
+
 								.other_2 {
 									font-size: var(--font14Size);
-								
+
 									text {
 										color: #ff0000;
 										padding: 0 2vw 0 0;

pagesMy/dough/index.vue

@@ -8,16 +8,13 @@
 							<view class="list-scroll-view">
 								<view class="one_1">
 									<view class="one_1_1">
-										<picker v-if="tabs.active=='0'" class="picker" mode="selector"
-											:range="ostatusList" @change="statusChange" range-key="label">
+										<picker v-if="tabs.active=='0'" class="picker" mode="selector" :range="ostatusList" @change="statusChange" range-key="label">
 											<view>{{status_name||'请选择状态'}}</view>
 										</picker>
-										<picker v-else-if="tabs.active=='-1'" class="picker" mode="selector"
-											:range="astatusList" @change="statusChange" range-key="label">
+										<picker v-else-if="tabs.active=='-1'" class="picker" mode="selector" :range="astatusList" @change="statusChange" range-key="label">
 											<view>{{status_name||'请选择状态'}}</view>
 										</picker>
-										<picker v-else-if="tabs.active=='1'" class="picker" mode="selector"
-											:range="gstatusList" @change="statusChange" range-key="label">
+										<picker v-else-if="tabs.active=='1'" class="picker" mode="selector" :range="gstatusList" @change="statusChange" range-key="label">
 											<view>{{status_name||'请选择状态'}}</view>
 										</picker>
 									</view>
@@ -40,13 +37,8 @@
 											<view class="list_1_2">
 												<view class="goods">
 													<view class="goods_1">
-														<image class="image"
-															v-if="item.spec.file&&item.spec.file.length>0"
-															:src="item.spec.file&&item.spec.file.length>0?item.spec.file[0].url:''"
-															mode=""></image>
-														<image class="image" v-else
-															:src="item.goods.file&&item.goods.file.length>0?item.goods.file[0].url:''"
-															mode=""></image>
+														<image class="image" v-if="item.spec.file&&item.spec.file.length>0" :src="item.spec.file&&item.spec.file.length>0?item.spec.file[0].url:''" mode=""></image>
+														<image class="image" v-else :src="item.goods.file&&item.goods.file.length>0?item.goods.file[0].url:''" mode=""></image>
 													</view>
 													<view class="goods_2">
 														<view class="goodsname textOver">
@@ -71,19 +63,12 @@
 												<text>实付款¥{{item.pay}}</text>
 											</view>
 											<view class="btn">
-												<button v-if="item.status=='0'||item.status=='1'" size="mini"
-													@tap.stop="toCancel(item)">取消订单</button>
-												<button v-if="item.status=='0'" size="mini" :disabled="disabled"
-													@tap.stop="toPay(item)">支付</button>
-												<button v-if="item.status=='2'||item.status=='3'||item.status=='2-'"
-													size="mini" @tap.stop="toLogi(item,'order')">查看物流</button>
-												<button v-if="item.status=='2'&&item.is_afterSale!=true" size="mini"
-													@tap.stop="toConfirm(item,'order')">确认收货</button>
-												<button
-													v-if="item.status=='2'||item.status=='2-'&&item.is_afterSale!=true"
-													size="mini" @tap.stop="toReject(item)">拒收</button>
-												<button v-if="item.status=='3'" size="mini"
-													@tap.stop="toAfter(item)">申请售后</button>
+												<button v-if="item.status=='0'||item.status=='1'" size="mini" @tap.stop="toCancel(item)">取消订单</button>
+												<button v-if="item.status=='0'" size="mini" :disabled="disabled" @tap.stop="toPay(item)">支付</button>
+												<button v-if="item.status=='2'||item.status=='3'||item.status=='2-'" size="mini" @tap.stop="toLogi(item,'order')">查看物流</button>
+												<button v-if="item.status=='2'&&item.is_afterSale!=true" size="mini" @tap.stop="toConfirm(item,'order')">确认收货</button>
+												<button v-if="item.status=='2'||item.status=='2-'&&item.is_afterSale!=true" size="mini" @tap.stop="toReject(item)">拒收</button>
+												<button v-if="item.status=='3'" size="mini" @tap.stop="toAfter(item)">申请售后</button>
 												<!-- 	<button v-if="item.status=='3'" type="default" size="mini"
 													@tap.stop="toAppraise(item)">{{item.rate?'追加评价':'立即评价'}}</button> -->
 											</view>
@@ -99,12 +84,8 @@
 												</view>
 											</view>
 											<view class="list_2_2">
-												<image class="image" v-if="item.spec.file&&item.spec.file.length>0"
-													:src="item.spec.file&&item.spec.file.length>0?item.spec.file[0].url:''"
-													mode=""></image>
-												<image class="image" v-else
-													:src="item.goods.file&&item.goods.file.length>0?item.goods.file[0].url:''"
-													mode=""></image>
+												<image class="image" v-if="item.spec.file&&item.spec.file.length>0" :src="item.spec.file&&item.spec.file.length>0?item.spec.file[0].url:''" mode=""></image>
+												<image class="image" v-else :src="item.goods.file&&item.goods.file.length>0?item.goods.file[0].url:''" mode=""></image>
 												<view class="other">
 													<view class="name textOver">
 														{{item.goods.name||'暂无'}}
@@ -124,20 +105,10 @@
 												</view>
 											</view>
 											<view class="btn">
-												<button v-if="item.status=='0'" type="default" size="mini"
-													@tap.stop="toCancels(item)">取消售后</button>
-												<button
-													v-if="item.type!='1'&&item.status=='2'||item.status=='3'&&!item.transport.shop_receive"
-													type="default" size="mini"
-													@tap.stop="toMaintain(item)">维护单号</button>
-												<button
-													v-if="item.type=='3'&&item.status=='3'||item.status=='-3'&&item.transport.customer_receive==true"
-													type="default" size="mini"
-													@tap.stop="toLogi(item,'after')">查看物流</button>
-												<button
-													v-if="item.type=='3'&&item.status=='3'&&item.transport.customer_receive==true"
-													type="default" size="mini"
-													@tap.stop="toConfirm(item,'after')">确认收货</button>
+												<button v-if="item.status=='0'" type="default" size="mini" @tap.stop="toCancels(item)">取消售后</button>
+												<button v-if="item.type!='1'&&item.status=='2'||item.status=='3'&&!item.transport.shop_receive" type="default" size="mini" @tap.stop="toMaintain(item)">维护单号</button>
+												<button v-if="item.type=='3'&&item.status=='3'||item.status=='-3'&&item.transport.customer_receive==true" type="default" size="mini" @tap.stop="toLogi(item,'after')">查看物流</button>
+												<button v-if="item.type=='3'&&item.status=='3'&&item.transport.customer_receive==true" type="default" size="mini" @tap.stop="toConfirm(item,'after')">确认收货</button>
 											</view>
 										</view>
 										<view class="list_2" v-else @tap.stop="toLook(item)">
@@ -151,9 +122,7 @@
 												</view>
 											</view>
 											<view class="list_2_2">
-												<image class="image"
-													:src="item.goods.file&&item.goods.file.length>0?item.goods.file[0].url:''"
-													mode="">
+												<image class="image" :src="item.goods.file&&item.goods.file.length>0?item.goods.file[0].url:''" mode="">
 												</image>
 												<view class="other">
 													<view class="name textOver">
@@ -175,13 +144,9 @@
 											</view>
 											<view class="btn">
 												<button size="mini" v-if="item.status=='0'" open-type="share" @tap.stop="toShare(item)">分享</button>
-												<button type="default" v-if="item.can_group==true&&item.status!='1'"
-													size="mini" @tap.stop="toCan(item)">开团</button>
-												<button type="default" v-if="item.status=='0'||item.status=='1'"
-													size="mini" @tap.stop="toHandle(item)">团购订单</button>
-												<button type="default" size="mini"
-													v-if="item.status=='0'||item.status=='2'"
-													@tap.stop="toSet(item)">散团</button>
+												<button type="default" v-if="item.can_group==true&&item.status!='1'" size="mini" @tap.stop="toCan(item)">开团</button>
+												<button type="default" v-if="item.status=='0'||item.status=='1'" size="mini" @tap.stop="toHandle(item)">团购订单</button>
+												<button type="default" size="mini" v-if="item.status=='0'||item.status=='2'" @tap.stop="toSet(item)">散团</button>
 											</view>
 										</view>
 									</view>
@@ -258,7 +223,10 @@
 				disabled: false
 			};
 		},
-		onShow: async function() {
+		onShow: function() {
+
+		},
+		onLoad: async function() {
 			const that = this;
 			await that.searchOther();
 			await that.watchLogin();