Merge branch 'dev_7.1.0' into fixbug-ZYW

src/component/plus/plus.js

@@ -45,6 +45,7 @@ Component({
         url: app.globalData.ctx + '/sale/premium/query',
         header: {
           'tunnel-token' : 'aa8a1bfb7f6c5031d172d94b6574293ef954a6f2d4e16657da008e0cc15588feD'
+          // 'tunnel-token' : 'd6db651f8b9c7db4176465accfc1c913843fd9ad328cd5f4fe201d918072c9e8' // 生产
         },
         success: (res) => {
           const { result, data } = res.data

src/config/index.js

@@ -4,7 +4,7 @@ const needMock = '' //
 // appid_dev_wx   wxc3b64b09b1d3dfc2
 // appid_test_wx  wx857ea77f4f7f4f34 wxac09792264c49b5c
 // appid_pre_711  wx358b56af62edbde1
-// appid_prod_711  wx700028bf32a3be66 wx313ec36b710125d4---3001
+// appid_prod_711  wx700028bf32a3be66 wx313ec36b710125d4---3001 ---  tunnel-token
 
 // 1 2 3 步!!!!!!!!!!!!!!!!!!!!!!  prod appid brandId
 

src/pages/confirmOrder/confirmOrder.wxml

@@ -67,7 +67,7 @@
 		<view class="pro-wrap">
 			<block wx:for="{{currentOrderList.tradePreviewSkus}}" wx:key="{{item}}">
 				<view class="pro-list">
-					<image class="pro-img" src="{{item.productImgUrl}}" />
+					<image class="pro-img" src="{{item.skuImgUrl}}" />
 					<view class="pro-info">
 						<view class="pro-name">{{item.productName}}</view>
 						<view class="pro-desc">

src/pages/order/order.js

@@ -145,13 +145,14 @@ wxService.page({
   },
   // 立即支付
   handelToPay(e) {
-    const { id } = e.currentTarget.dataset
-    console.log('0000', id)
+    const { id, merged } = e.currentTarget.dataset
+    let url = merged ? `/sale/payment/merged/buyer/wxprepay/${id}` : `/sale/trade/buyer/wxprepay/${id}`
     wx.showLoading({
       title: '加载中',
       mask: true
     })
-    wxService.post(`/sale/trade/buyer/wxprepay/${id}`).then(res => {
+    wxService.post(`${url}`).then(res => {
+    // wxService.post(`/sale/trade/buyer/wxprepay/${id}`).then(res => {
       if (res) {
         const { result, data } = res.data
         if (result == 0) {

src/pages/order/order.wxml

@@ -63,7 +63,7 @@
 									<view class="upload_Item">
 										<image
 										 class="upload_Item_img"
-										 src="{{sub.mainImgUrl}}"
+										 src="{{sub.skuImgUrl}}"
 										 bindtap='goProDetail'
 										 data-id='{{sub.goodsId}}'
 										/>
@@ -93,7 +93,7 @@
 									<view class="upload_Item">
 										<image
 										 class="upload_Item_img"
-										 src="{{sub.mainImgUrl}}"
+										 src="{{sub.skuImgUrl}}"
 										 bindtap='goProDetail'
 										 data-id='{{sub.goodsId}}'
 										/>
@@ -142,7 +142,7 @@
 							<button class="btn btn-sm btn-default" data-id="{{item.id}}" bindtap="handelDelOrder">删除订单</button>
 						</view>
 						<view class="order-status" wx-if="{{item.status == 'N'}}">
-							<button class="btn btn-sm btn-primary btn-outline" data-id="{{item.id}}" bindtap="handelToPay">立即支付</button>
+							<button class="btn btn-sm btn-primary btn-outline" data-merged="{{item.mergedAmount}}" data-id="{{item.id}}" bindtap="handelToPay">立即支付</button>
 						</view>
 						<view class="order-status" wx-if="{{item.status == 'P'}}">
 							<button

src/pages/orderDetail/orderDetail.js

@@ -165,7 +165,6 @@ wxService.page({
   },
   // 立即支付
   handelToPay(e) { 
-    console.log('立即支付') 
     const { id } = e.currentTarget.dataset
     wx.showLoading({
       title: '加载中',

src/pages/orderDetail/orderDetail.wxml

@@ -54,7 +54,7 @@
 	<view class="pro-wrap">
 		<block wx:for="{{detail.skuVOList}}" wx:for-item="item" wx:key="">
 			<view class="pro-list">
-				<image class="pro-img" src="{{item.mainImgUrl}}" />
+				<image class="pro-img" src="{{item.skuImgUrl}}" />
 				<view class="pro-info">
 					<view class="pro-name">{{item.productName}}</view>
 					<view class="pro-desc">

src/pages/orderDetail/orderDetail.wxss

@@ -6,6 +6,10 @@ page{
   padding-bottom: 95rpx;
   overflow-x: hidden;
 }
+.order-number-item {
+  display: flex;
+  align-items: center;
+}
 .header-wrap{
   position: relative;
   height: 180rpx;

src/pages/refund/refund.wxml

@@ -14,7 +14,7 @@
 					/>
 				</view>
 				<view class="pro-info">
-					<image class="pro-img" src="{{item.mainImgUrl ? item.mainImgUrl: '/assets/imgs/7_1_0/icon.png'}}" mode="widthFix" />
+					<image class="pro-img" src="{{item.skuImgUrl ? item.skuImgUrl: '/assets/imgs/7_1_0/icon.png'}}" mode="widthFix" />
 					<view class="pro-right-info">
 						<view class="pro-name">{{item.name}}</view>
 						<view class="pro-sku">{{item.sku}}</view>

src/pages/refundDetail/refundDetail.wxml

@@ -30,15 +30,15 @@
 	</view>
 
 	<view class="logistics-wrap">
-		<view class="logistics-info">
+		<view class="logistics-info" wx:if="{{refundDetail.refundLogistic.supplierName}}">
 			<view class="logistics-item">
 				<text>物流公司</text>
-				<text class="company">{{refundDetail.tradeVO.logistic.supplierName}}</text>
+				<text class="company">{{refundDetail.refundLogistic.supplierName}}</text>
 			<!--	<text class="company">{{refundDetail.refundLogistic.supplierName}}</text> -->
 			</view>
 			<view class="logistics-item">
 				<text>快递单号</text>
-				<text class="company">{{refundDetail.tradeVO.logistic.code}}</text>
+				<text class="company">{{refundDetail.refundLogistic.code}}</text>
 				<!--<text class="company">{{refundDetail.refundLogistic.code}}</text>-->
 			</view>
 			<view class="write-logistics" bindtap="tapWriteLogis" wx:if="{{refundDetail.status == 'A'}}">
@@ -52,12 +52,12 @@
 			<text class="choose-pro">选择商品</text>
 			<view class="pro-total-price">
 				退款总金额
-				<text class="total-price">￥{{refundDetail.amount}}</text>
+				<text class="total-price">￥{{refundDetail.amount? refundDetail.amount : refundDetail.previewAmount}}</text>
 			</view>
 		</view>
 		<block wx:for="{{refundDetail.tradeVO.skuVOList}}" wx:for-item="item" wx:key="{{item}}">
 			<view class="pro-list">
-				<image class="pro-img" src="{{item.mainImgUrl}}" />
+				<image class="pro-img" src="{{item.skuImgUrl}}" />
 				<view class="pro-info">
 					<view class="pro-name">{{item.productName}}</view>
 					<view class="pro-desc">
@@ -92,7 +92,7 @@
 		<view class="refund-item">
 			<text class="refund-label">寄回信息</text>
 			<text class="refund-desc" selectable="true">{{refundDetail.refundLogistic.receiverAddress}}</text>
-			<view class="copy" bindtap="copy" data-content="{{refundDetail.refundLogistic.receiverAddress}}">复制</view>
+			<view class="copy" wx:if="{{refundDetail.refundLogistic.receiverAddress}}" bindtap="copy" data-content="{{refundDetail.refundLogistic.receiverAddress}}">复制</view>
 		</view>
 		<view class="refund-item">
 			<text class="refund-label">退货凭证</text>

src/project.config.json

@@ -39,7 +39,7 @@
 			"list": []
 		},
 		"miniprogram": {
-			"current": 23,
+			"current": 22,
 			"list": [
 				{
 					"id": -1,
@@ -186,7 +186,7 @@
 					"id": 22,
 					"name": "退单详情",
 					"pathName": "pages/refundDetail/refundDetail",
-					"query": "id=625052614006149120",
+					"query": "id=626842713396088832",
 					"scene": null
 				},
 				{

src/utils/Http.js

@@ -100,6 +100,7 @@ class Http {
         method: 'GET',
         header: {
           'tunnel-token': 'aa8a1bfb7f6c5031d172d94b6574293ef954a6f2d4e16657da008e0cc15588feD',
+          // 'tunnel-token' : 'd6db651f8b9c7db4176465accfc1c913843fd9ad328cd5f4fe201d918072c9e8', // 生产
           'tentacle-content': this.getTentacle(),
           // 'tentacle-content': '{"id":"621346354647797760","tentacleType":3,"tentacleId":"611969009872691200","contentType":1}'
 
@@ -131,6 +132,7 @@ class Http {
         method: 'POST',
         header: {
           'tunnel-token': 'aa8a1bfb7f6c5031d172d94b6574293ef954a6f2d4e16657da008e0cc15588feD',
+          // 'tunnel-token' : 'd6db651f8b9c7db4176465accfc1c913843fd9ad328cd5f4fe201d918072c9e8', // 生产
           'tentacle-content': this.getTentacle()
           // 'tentacle-content': '{"id":"621346354647797760","tentacleType":3,"tentacleId":"611969009872691200","contentType":1}'
         },