小程序模式

application/api/controller/Cart.php

@@ -50,8 +50,8 @@ class Cart extends Common
         $ret['data'] = [
             'data'                              => $ret['data'],
             'customer_service_tel'              => MyC('common_app_customer_service_tel', null, true),
-            'common_is_exhibition_mode_btn_text'=> MyC('common_is_exhibition_mode_btn_text', null, true),
+            'common_is_exhibition_mode_btn_text'=> MyC('common_is_exhibition_mode_btn_text', '立即咨询', true),
-            'common_is_exhibition_mode'         => (int) MyC('common_is_exhibition_mode', 0),
+            'common_site_type'                  => (int) MyC('common_site_type', 0, true),
         ];
         
         return $ret;

public/appmini/old/weixin/pages/cart/cart.js

@@ -11,7 +11,7 @@ Page({
     buy_submit_disabled_status: true,
 
     // 是否展示型
-    common_is_exhibition_mode: 0,
+    common_site_type: 0,
     common_is_exhibition_mode_btn_text: null,
     customer_service_tel: null,
   },
@@ -77,7 +77,7 @@ Page({
             data_list_loding_msg: '购物车空空如也',
 
             // 是否展示型
-            common_is_exhibition_mode: data.common_is_exhibition_mode || 0,
+            common_site_type: data.common_site_type || 0,
             common_is_exhibition_mode_btn_text: data.common_is_exhibition_mode_btn_text || '立即咨询',
             customer_service_tel: data.customer_service_tel || null,
           });

public/appmini/old/weixin/pages/cart/cart.wxml

@@ -1,7 +1,7 @@
 <view wx:if="{{data_list.length > 0}}" class="page">
-  <view wx:for="{{data_list}}" wx:key="key" class="goods-item oh bg-white {{common_is_exhibition_mode == 1 ? 'exhibition-mode-data' : ''}}">
+  <view wx:for="{{data_list}}" wx:key="key" class="goods-item oh bg-white {{common_site_type == 1 ? 'exhibition-mode-data' : ''}}">
     <!-- 选择 -->
-    <view wx:if="{{common_is_exhibition_mode != 1}}" bindtap="selectedt_event" data-type="node" data-index="{{index}}" class="fl selected">
+    <view wx:if="{{common_site_type != 1}}" bindtap="selectedt_event" data-type="node" data-index="{{index}}" class="fl selected">
       <image class="icon" src="/images/default-select{{(item.is_error || 0) == 1 ? '-disabled' : ((item.selected || false) ? '-active' : '')}}-icon.png" mode="widthFix" />
     </view>
 
@@ -44,13 +44,13 @@
   <!-- 操作导航 -->
   <view wx:if="{{data_list.length > 0}}" class="buy-nav oh wh-auto br-t">
     <!-- 展示型 -->
-    <block wx:if="{{common_is_exhibition_mode == 1}}">
+    <block wx:if="{{common_site_type == 1}}">
       <view class="exhibition-mode">
         <button class="bg-main wh-auto" type="default" bindtap="exhibition_submit_event" hover-class="none">{{common_is_exhibition_mode_btn_text}}</button>
       </view>
     </block>
 
-    <!-- 销售型 -->
+    <!-- 销售,自提,虚拟销售 -->
     <block wx:else>
       <view class="nav-base bg-white fl single-text">
         <view bindtap="selectedt_event" data-type="all" class="fl selected">

public/appmini/old/weixin/pages/extraction-address/extraction-address.wxss

@@ -11,7 +11,7 @@
 .address-alias {
   border: 1px solid #d2364c;
   color: #d2364c;
-  padding: 4rpx 10rpx;
+  padding: 2rpx 10rpx;
   border-radius: 6rpx;
   margin-right: 10rpx;
 }

public/appmini/old/weixin/pages/user-address/user-address.wxss

@@ -11,7 +11,7 @@
 .address-alias {
   border: 1px solid #d2364c;
   color: #d2364c;
-  padding: 4rpx 10rpx;
+  padding: 2rpx 10rpx;
   border-radius: 6rpx;
   margin-right: 10rpx;
 }

public/appmini/old/weixin/pages/user-order/user-order.js

@@ -227,10 +227,8 @@ Page({
         if (res.data.code == 0) {
           // 是否在线支付,非在线支付则支付成功
           if (res.data.data.is_online_pay == 0) {
-            var temp_data_list = this.data.data_list;
+            // 数据设置
-            temp_data_list[index]['status'] = 2;
+            self.order_item_pay_success_handle(index);
-            temp_data_list[index]['status_name'] = '待发货';
-            this.setData({ data_list: temp_data_list });
 
             app.showToast("支付成功", "success");
           } else {
@@ -242,10 +240,7 @@ Page({
               paySign: res.data.data.data.paySign,
               success: function(res) {
                 // 数据设置
-                var temp_data_list = self.data.data_list;
+                self.order_item_pay_success_handle(index);
-                temp_data_list[index]['status'] = 2;
-                temp_data_list[index]['status_name'] = '待发货';
-                self.setData({ data_list: temp_data_list });
 
                 // 跳转支付页面
                 wx.navigateTo({
@@ -269,6 +264,32 @@ Page({
     });
   },
 
+  // 支付成功数据设置
+  order_item_pay_success_handle(index) {
+    // 数据设置
+    var temp_data_list = this.data.data_list;
+    switch (parseInt(temp_data_list[index]['order_model'])) {
+      // 销售模式
+      case 0:
+        temp_data_list[index]['status'] = 2;
+        temp_data_list[index]['status_name'] = '待发货';
+        break;
+
+      // 自提模式
+      case 2:
+        temp_data_list[index]['status'] = 2;
+        temp_data_list[index]['status_name'] = '待取货';
+        break;
+
+      // 虚拟模式
+      case 3:
+        temp_data_list[index]['status'] = 3;
+        temp_data_list[index]['status_name'] = '待收货';
+        break;
+    }
+    this.setData({ data_list: temp_data_list });
+  },
+
   // 取消
   cancel_event(e) {
     wx.showModal({