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

pagesMy/order/all.vue

@@ -23,21 +23,16 @@
 													</view>
 												</view>
 												<view class="goodsList_1">
-													<view class="market" v-for="(tag,indexs) in item.spec"
-														:key="indexss">
+													<view class="market" v-for="(tag,indexs) in item.spec" :key="indexss">
 														<view class="market_1">
-															<image class="image" v-if="tag.file&&tag.file.length>0"
-																:src="tag.file&&tag.file.length>0?tag.file[0].url:''"
-																mode=""></image>
-															<image class="image" v-else
-																:src="tag.goods.file&&tag.goods.file.length>0?tag.goods.file[0].url:''"
-																mode=""></image>
+															<image class="image" v-if="tag.file&&tag.file.length>0" :src="tag.file&&tag.file.length>0?tag.file[0].url:''" mode=""></image>
+															<image class="image" v-else :src="tag.goods.file&&tag.goods.file.length>0?tag.goods.file[0].url:''" mode=""></image>
 														</view>
 														<view class="market_2">
 															<view class="goodsname textOver">
-																{{tag.goods.name}}
+																{{tag.name||tag.goods.name}}
 															</view>
-															<view class="specs">
+															<view class="specs" v-if="tag.is_set!='0'">
 																{{tag.name}}
 															</view>
 															<text v-if="tag.gift.length>0" class="gift">赠品</text>
@@ -62,23 +57,14 @@
 												<text>实付款¥{{item.real_pay}}</text>
 											</view>
 											<view class="btn">
-												<button v-if="item.status=='0'" size="mini"
-													@tap.stop="toCancel_order(item)">取消订单</button>
-												<button v-if="item.status=='0'" size="mini"
-													@tap.stop="toPay(item)">支付</button>
-												<button v-if="item.status=='1'&&item.is_afterSale!=true" size="mini"
-													@tap.stop="toCancels(item)">取消订单</button>
-												<button v-if="item.status=='2'||item.status=='3'||item.status=='2-'"
-													size="mini" @tap.stop="toLogi(item)">查看物流</button>
-												<button v-if="item.status=='2'&&item.is_afterSale!=true" size="mini"
-													@tap.stop="toConfirm(item)">确认收货</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>
+												<button v-if="item.status=='0'" size="mini" @tap.stop="toCancel_order(item)">取消订单</button>
+												<button v-if="item.status=='0'" size="mini" @tap.stop="toPay(item)">支付</button>
+												<button v-if="item.status=='1'&&item.is_afterSale!=true" size="mini" @tap.stop="toCancels(item)">取消订单</button>
+												<button v-if="item.status=='2'||item.status=='3'||item.status=='2-'" size="mini" @tap.stop="toLogi(item)">查看物流</button>
+												<button v-if="item.status=='2'&&item.is_afterSale!=true" size="mini" @tap.stop="toConfirm(item)">确认收货</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>
 										</view>
 										<view class="list_2" v-else>
@@ -94,13 +80,8 @@
 											<view class="list_2_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">
@@ -125,19 +106,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,'group_order')">支付</button>
-												<button v-if="item.status=='2'||item.status=='3'||item.status=='2-'"
-													size="mini" @tap.stop="toLogi(item,'group_order')">查看物流</button>
-												<button v-if="item.status=='2'&&item.is_afterSale!=true" size="mini"
-													@tap.stop="toConfirm(item,'group_order')">确认收货</button>
-												<button
-													v-if="item.status=='2'||item.status=='2-'&&item.is_afterSale!=true"
-													size="mini" @tap.stop="toReject(item,'group_order')">拒收</button>
-												<button v-if="item.status=='3'" size="mini"
-													@tap.stop="toAfter(item,'group_order')">申请售后</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,'group_order')">支付</button>
+												<button v-if="item.status=='2'||item.status=='3'||item.status=='2-'" size="mini" @tap.stop="toLogi(item,'group_order')">查看物流</button>
+												<button v-if="item.status=='2'&&item.is_afterSale!=true" size="mini" @tap.stop="toConfirm(item,'group_order')">确认收货</button>
+												<button v-if="item.status=='2'||item.status=='2-'&&item.is_afterSale!=true" size="mini" @tap.stop="toReject(item,'group_order')">拒收</button>
+												<button v-if="item.status=='3'" size="mini" @tap.stop="toAfter(item,'group_order')">申请售后</button>
 											</view>
 										</view>
 									</view>
@@ -154,8 +128,7 @@
 							<uni-easyinput type="text" v-model="searchInfo.goods" placeholder="请输入商品名称" />
 						</uni-forms-item>
 						<uni-forms-item label="状态" name="status">
-							<picker class="picker" mode="selector" :range="statusList" @change="statusChange"
-								range-key="label">
+							<picker class="picker" mode="selector" :range="statusList" @change="statusChange" range-key="label">
 								<view>{{status_name||'请选择状态'}}</view>
 							</picker>
 						</uni-forms-item>