Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product

yudao-ui-app/package.json

@@ -21,7 +21,7 @@
         "env": {
           "UNI_PLATFORM": "h5",
           "isVConsole": true,
-          "APP_BASE_URL": "http://192.168.1.147:48080"
+          "APP_BASE_URL": "http://192.168.1.188:48080"
         }
       },
       "prod": {

yudao-ui-app/pages/goods_cashier/index.vue

@@ -60,7 +60,7 @@
   import countDown from '@/components/countDown';
   import numberScroll from '@/components/numberScroll.vue'
   import {
-    getCashierOrder,
+    getOrderDetail,
     orderPay
   } from '@/api/order.js';
   export default {
@@ -125,7 +125,7 @@
     onLoad(options) {
       if (options.order_id) this.orderId = options.order_id
       if (options.from_type) this.fromType = options.from_type
-      // this.getCashierOrder()
+      this.getCashierOrder()
     },
     onShow() {
       let options = wx.getEnterOptionsSync();
@@ -175,39 +175,18 @@
       },
       getCashierOrder() {
         uni.showLoading({
-          title: '创建订单中'
+          title: '加载中'
         });
-        getCashierOrder(this.orderId, this.fromType).then(res => {
+        getOrderDetail(this.orderId).then(res => {
-          console.log(res)
+          console.log('res', res)
-          this.payPrice = this.payPriceShow = res.data.pay_price
+          const orderInfo = res.data
-          this.payPostage = res.data.pay_postage
+          this.payPrice = parseFloat(orderInfo.proTotalPrice).toFixed(2)
-          this.offlinePostage = res.data.offline_postage
+          this.payPriceShow = parseFloat(orderInfo.proTotalPrice).toFixed(2)
-          this.invalidTime = res.data.invalid_time
-          //微信支付是否开启
-          this.cartArr[0].payStatus = res.data.wechat_pay_status || 0
-          //支付宝是否开启
-          this.cartArr[1].payStatus = res.data.ali_pay_status || 0;
-          //#ifdef MP
-          this.cartArr[1].payStatus = false;
-          //#endif
-          //余额支付是否开启
-          // that.cartArr[2].title = '可用余额:' + res.data.userInfo.now_money;
-          this.cartArr[2].number = res.data.now_money;
-          this.cartArr[2].payStatus = res.data.yue_pay_status
-          if (res.data.offline_pay_status) {
-            this.cartArr[3].payStatus = 1
-          } else {
-            this.cartArr[3].payStatus = 0
-          }
-          //好友代付是否开启
-          this.cartArr[4].payStatus = res.data.friend_pay_status || 0;
-          uni.hideLoading();
         }).catch(err => {
-          uni.hideLoading();
           return this.$util.Tips({
             title: err
           })
-        })
+        }).finally(uni.hideLoading)
       },
       payType(number, paytype, index) {
         this.active = index;

yudao-ui-app/pages/user/index.vue

@@ -171,13 +171,13 @@
           {
             img: '/static/images/order_icon4.png',
             title: '已完成',
-            url: '/pages/users/order_list/index?status=3',
+            url: '/pages/users/order_list/index?status=4',
             num: 0
           },
           {
             img: '/static/images/order_icon5.png',
             title: '售后/退款',
-            url: '/pages/users/user_return_list/index',
+            url: '/pages/users/user_return_list/index?status=-3',
             num: 0
           },
         ],

yudao-ui-app/pages/users/order_confirm/index.vue

@@ -16,7 +16,7 @@
 						<view class="acea-row">
 							<text class='default font-color'
 								v-if="addressInfo.isDefault">[默认]</text>
-							<text class="line2">{{addressInfo.province}}{{addressInfo.city}}{{addressInfo.district}}{{addressInfo.detail}}</text>	
+							<text class="line2">{{addressInfo.province}}{{addressInfo.city}}{{addressInfo.district}}{{addressInfo.detail}}</text>
 						</view>
 					</view>
 					<view class='addressCon' v-else>
@@ -53,7 +53,7 @@
 							<text class='iconfont icon-jiantou'></text>
 						</view>
 					</view>
-					
+
 					<view class='item acea-row row-between-wrapper'
 						v-if="!orderInfoVo.bargainId && !orderInfoVo.combinationId && !orderInfoVo.seckillId && productType==='normal'">
 						<view>积分抵扣</view>
@@ -333,11 +333,11 @@
 		 */
 		onShow: function() {
 			let _this = this
-			// wx.getLaunchOptionsSync 
+			// wx.getLaunchOptionsSync
 			this.textareaStatus = true;
 			if (this.isLogin && this.toPay == false) {
 				//this.getaddressInfo();
-				
+
 			}
 
 			uni.$on("handClick", res => {
@@ -387,7 +387,7 @@
 			},
 			/**
 			 * 授权回调事件
-			 * 
+			 *
 			 */
 			onLoadFun: function() {
 				//this.getaddressInfo();
@@ -485,7 +485,7 @@
 			},
 			/**
 			 * 处理点击优惠券后的事件
-			 * 
+			 *
 			 */
 			ChangCoupons: function(e) {
 				// this.usableCoupon = e
@@ -549,7 +549,7 @@
 			},
 			/**
 			 * 获取当前金额可用优惠券
-			 * 
+			 *
 			 */
 			getCouponList: function() {
 				getCouponsOrderPrice(this.preOrderNo).then(res => {
@@ -628,7 +628,6 @@
 			},
 			getOrderPay: function(orderNo, message) {
 				let that = this;
-				console.log(orderNo,'orderNo')
 				uni.navigateTo({
 					url: '/pages/goods_cashier/index?order_id=' + orderNo
 				})
@@ -675,7 +674,7 @@
 				// 							title: err
 				// 						});
 				// 					})
-								
+
 				// 				},
 				// 				fail: function(e) {
 				// 					uni.hideLoading();