[最新更新]

api/request.js

@@ -7,9 +7,9 @@ import { errInfo } from './err'
 import { updToken } from './updateToken'
 
 // 正式地址
-const api 	 = "https://api.xuanhuojk.com/api/"
+// const api 	 = "https://api.xuanhuojk.com/api/"
 // 测试地址
-// const api 	 = "https://api.xhtest.douhuofalv.com/api/"
+const api 	 = "https://api.xhtest.douhuofalv.com/api/"
 const header = {
 	"Accept"	: "application/json"
 }

pages/bag/bag.wxml

@@ -1,4 +1,3 @@
-
 <view class="content">
     <block wx:if="{{isUser}}">
         <!-- 工具栏 -->
@@ -61,9 +60,8 @@
     <block wx:else>
         <!-- 用户未登录 -->
         <view class="pack-center pages-loding auth-login">
-            <image src="/static/icons/carnull_icon.png"></image>
             <view>您还未登录，无法查看您的购物车信息</view>
             <navigator class="auth-btn" url="/pages/login/index">登录</navigator>
         </view>
     </block>
-</view>
+</view>

pages/bag/bagConfirm/bagConfirm.js

@@ -18,12 +18,11 @@ Page({
         freight      : '',   // 运费
         weight       : '',   // 重量
         distribution : [
-            { type: 2, title: "选择配送方式" },
-            { type: 0, title: "快递" },
-            { type: 1, title: "自提" },
+            { type: 0, title: "选择配送方式" },
+            { type: 1, title: "快递" },
+            { type: 2, title: "自提" },
         ],
-        distributionIndex: 0,
-        distributionType : 2
+        distributionIndex: 0
     },
 
     /**
@@ -43,8 +42,7 @@ Page({
     distributionChange(e){
         if(e.detail.value === this.data.distributionIndex) return
         this.setData({
-            distributionIndex   : e.detail.value,
-            distributionType    : this.data.distribution[e.detail.value].type
+            distributionIndex: e.detail.value
         })
         this.placeInfo(this.data.skuId);
     },
@@ -96,7 +94,7 @@ Page({
             cart_ids      : this.data.skuId,
             address_id    : this.data.address.address_id,
             remark        : '',
-            delivery_type : this.data.distributionType
+            delivery_type : this.data.distributionIndex
         }).then(res => {
             wx.redirectTo({
                 url: '/pages/pay/index?params=' + encodeURIComponent(JSON.stringify(res.data))

pages/pay/index.js

@@ -75,14 +75,9 @@ Page({
                     loding: false
                 })
                 break;
-            default:
-                wx.showToast({
-                    title: '请选择支付',
-                    icon : 'none'
-                })
-                this.setData({
-                    loding: false
-                })
+            case 'baofoo':
+                this.baofuPay()
+                break;
         }
     },
     /**

pages/pay/index.wxml

@@ -31,12 +31,12 @@
                 </view>
                 <radio class="radio-radio" value="coin" color="#da2b54" checked="{{payType == 'coin'}}"/>
             </label>
-            <label class="radio-flex" wx:if="{{can.baofu == 1}}">
+            <label class="radio-flex" wx:if="{{can.baofoo == 1}}">
                 <view class="radio-text">
                     <image class="radio-icon" src="/static/pay/wechat.png"></image>
                     <text>微信支付（宝付）</text>
                 </view>
-                <radio class="radio-radio" value="baofu" color="#da2b54" checked="{{payType == 'baofu'}}"/>
+                <radio class="radio-radio" value="baofoo" color="#da2b54" checked="{{payType == 'baofoo'}}"/>
             </label>
         </radio-group>
         <view class="radio-lay" wx:if="{{loding}}"></view>

pages/store/store.wxml

@@ -1,4 +1,3 @@
-
 <view class="content">
     <view class="store-city">当前所在城市：哈尔滨市</view>
     <view class="store-title">请选择自提门店</view>
@@ -19,4 +18,4 @@
             <view class="store-item-km">距离1.0KM</view>
         </view>
     </view>
-</view>
+</view>

pages/store/store.wxss

@@ -14,4 +14,4 @@
 .store-item:last-child::after{ display: none; }
 .store-item-title{ font-weight: bold; line-height: 50rpx; font-size: 32rpx; }
 .store-item-address{ font-size: 28rpx; color: gray; line-height: 40rpx; }
-.store-item-km{ position: absolute; right: 30rpx; font-size: 26rpx; color: gray; top: 50%; line-height: 40rpx; margin-top: -20rpx; }
+.store-item-km{ position: absolute; right: 30rpx; font-size: 26rpx; color: gray; top: 50%; line-height: 40rpx; margin-top: -20rpx; }

project.private.config.json

@@ -17,15 +17,15 @@
                 },
                 {
                     "name": "购物车",
-                    "pathName": "pages/empower/writeOff/writeOff",
+                    "pathName": "pages/bag/bag",
                     "query": "",
                     "launchMode": "default",
                     "scene": null
                 },
                 {
-                    "name": "提现",
-                    "pathName": "pages/empower/writeOff/writeOff",
-                    "query": "",
+                    "name": "朋友圈进入详情",
+                    "pathName": "pages/mall/details/details",
+                    "query": "id=3&invite=null",
                     "launchMode": "default",
                     "scene": 1084
                 },