百度小程序开发

application/service/ConfigService.php

@@ -306,7 +306,7 @@ class ConfigService
         ]);
 
         // 坐标处理
-        if(!empty($data) && is_array($data) && in_array(APPLICATION_CLIENT_TYPE, ['weixin', 'alipay']))
+        if(!empty($data) && is_array($data) && in_array(APPLICATION_CLIENT_TYPE, ['weixin', 'alipay', 'baidu']))
         {
             foreach($data as &$v)
             {

application/service/OrderService.php

@@ -884,7 +884,9 @@ class OrderService
     {
         // 销售模式+自提模式 地址信息
         $data = Db::name('OrderAddress')->where(['order_id'=>$order_id])->find();
-        if(!empty($data) && is_array($data))
+        
+        // 坐标处理
+        if(!empty($data) && is_array($data) && in_array(APPLICATION_CLIENT_TYPE, ['weixin', 'alipay', 'baidu']))
         {
             // 坐标转换 百度转火星(高德，谷歌，腾讯坐标)
             if(isset($data['lng']) && isset($data['lat']) && $data['lng'] > 0 && $data['lat'] > 0)

public/appmini/old/alipay/pages/user-order-detail/user-order-detail.acss

@@ -8,7 +8,7 @@
     padding: 10rpx 35rpx 10rpx 10rpx;
 }
 .address-detail .icon {
-    width: 35rpx;
+    width: 30rpx;
     height: 35rpx !important;
 }
 .address-detail .text {
@@ -139,6 +139,9 @@
   top: 0;
   right: 0;
 }
+.site-fictitious .panel-content .right-value .not-value {
+    margin-left: 10rpx;
+}
 
 /*
  * 自提信息

public/appmini/old/alipay/pages/user-order-detail/user-order-detail.axml

@@ -51,7 +51,7 @@
           <view a:if="{{(item.fictitious_goods_value || null) != null}}" class="rich-text-value">
             <rich-text nodes="{{item.fictitious_goods_value}}"></rich-text>
           </view>
-          <text a:else class="cr-888">未配置数据</text>
+          <text a:else class="cr-888 not-value">未配置数据</text>
         </view>
       </view>
     </view>

public/appmini/old/baidu/app.js

@@ -63,7 +63,7 @@ App({
     // 请求地址
     request_url: "{{request_url}}",
      request_url: 'http://tp5-dev.com/',
-    // request_url: 'https://test.shopxo.net/',
+     request_url: 'https://dev.shopxo.net/',
 
     // 基础信息
     application_title: "{{application_title}}",

public/appmini/old/baidu/pages/answer-form/answer-form.js

@@ -52,8 +52,9 @@ Page({
             }, 2000);
           } else {
             this.setData({ form_submit_loading: false });
-
-            app.showToast(res.data.msg);
+            if (app.is_login_check(res.data)) {
+                app.showToast(res.data.msg);
+            }
           }
         },
         fail: () => {

public/appmini/old/baidu/pages/answer-list/answer-list.js

@@ -75,8 +75,9 @@ Page({
           this.setData({
             data_list_loding_status: 0
           });
-
-          app.showToast(res.data.msg);
+          if (app.is_login_check(res.data)) {
+            app.showToast(res.data.msg);
+          }
         }
       },
       fail: () => {

public/appmini/old/baidu/pages/buy/buy.css

@@ -137,8 +137,9 @@
 .content-textarea-view textarea {
   height: 180rpx;
 }
+.content-textarea-view textarea,
 .content-textarea-view view {
-  padding: 12rpx;
+    padding: 10rpx;
 }
 
 /**

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

@@ -87,7 +87,9 @@ Page({
             data_bottom_line_status: false,
             data_list_loding_msg: res.data.msg
           });
-          app.showToast(res.data.msg);
+          if (app.is_login_check(res.data)) {
+            app.showToast(res.data.msg);
+          }
         }
       },
       fail: () => {

public/appmini/old/baidu/pages/coupon/coupon.js

@@ -61,7 +61,9 @@ Page({
             data_list_loding_status: 2,
             data_list_loding_msg: res.data.msg
           });
-          app.showToast(res.data.msg);
+          if (app.is_login_check(res.data)) {
+            app.showToast(res.data.msg);
+          }
         }
       },
       fail: () => {

public/appmini/old/baidu/pages/goods-comment/goods-comment.js

@@ -125,8 +125,9 @@ Page({
             this.setData({
               data_list_loding_status: 0
             });
-
-            app.showToast(res.data.msg);
+            if (app.is_login_check(res.data)) {
+                app.showToast(res.data.msg);
+            }
           }
         },
         fail: () => {

public/appmini/old/baidu/pages/goods-detail/goods-detail.js

@@ -277,7 +277,9 @@ Page({
             });
             app.showToast(res.data.msg, "success");
           } else {
-            app.showToast(res.data.msg);
+            if (app.is_login_check(res.data)) {
+                app.showToast(res.data.msg);
+            }
           }
         },
         fail: () => {
@@ -312,7 +314,9 @@ Page({
             this.popup_close_event();
             app.showToast(res.data.msg, "success");
           } else {
-            app.showToast(res.data.msg);
+            if (app.is_login_check(res.data)) {
+                app.showToast(res.data.msg);
+            }
           }
         },
         fail: () => {
@@ -421,7 +425,9 @@ Page({
             this.setData({ goods_specifications_choose: temp_data });
           }
         } else {
-          app.showToast(res.data.msg);
+          if (app.is_login_check(res.data)) {
+            app.showToast(res.data.msg);
+          }
         }
       },
       fail: () => {
@@ -471,7 +477,9 @@ Page({
             goods_spec_base_inventory: res.data.data.inventory
           });
         } else {
-          app.showToast(res.data.msg);
+          if (app.is_login_check(res.data)) {
+            app.showToast(res.data.msg);
+          }
         }
       },
       fail: () => {

public/appmini/old/baidu/pages/message/message.js

@@ -88,8 +88,9 @@ Page({
           this.setData({
             data_list_loding_status: 0
           });
-
-          app.showToast(res.data.msg);
+          if (app.is_login_check(res.data)) {
+            app.showToast(res.data.msg);
+          }
         }
       },
       fail: () => {

public/appmini/old/baidu/pages/user-address-save/user-address-save.js

@@ -87,7 +87,9 @@ Page({
             self.init_value();
           }, 500);
         } else {
-          app.showToast(res.data.msg);
+          if (app.is_login_check(res.data)) {
+            app.showToast(res.data.msg);
+          }
         }
       },
       fail: () => {

public/appmini/old/baidu/pages/user-address/user-address.js

@@ -75,8 +75,9 @@ Page({
           this.setData({
             data_list_loding_status: 0
           });
-
-          app.showToast(res.data.msg);
+          if (app.is_login_check(res.data)) {
+            app.showToast(res.data.msg);
+          }
         }
       },
       fail: () => {

public/appmini/old/baidu/pages/user-answer-list/user-answer-list.js

@@ -90,8 +90,9 @@ Page({
           this.setData({
             data_list_loding_status: 0
           });
-
-          app.showToast(res.data.msg);
+          if (app.is_login_check(res.data)) {
+            app.showToast(res.data.msg);
+          }
         }
       },
       fail: () => {

public/appmini/old/baidu/pages/user-coupon/user-coupon.js

@@ -62,7 +62,9 @@ Page({
             data_list_loding_status: 2,
             data_list_loding_msg: res.data.msg
           });
-          app.showToast(res.data.msg);
+          if (app.is_login_check(res.data)) {
+            app.showToast(res.data.msg);
+          }
         }
       },
       fail: () => {

public/appmini/old/baidu/pages/user-faovr/user-faovr.js

@@ -88,8 +88,9 @@ Page({
           this.setData({
             data_list_loding_status: 0
           });
-
-          app.showToast(res.data.msg);
+          if (app.is_login_check(res.data)) {
+            app.showToast(res.data.msg);
+          }
         }
       },
       fail: () => {

public/appmini/old/baidu/pages/user-goods-browse/user-goods-browse.js

@@ -88,8 +88,9 @@ Page({
           this.setData({
             data_list_loding_status: 0
           });
-
-          app.showToast(res.data.msg);
+          if (app.is_login_check(res.data)) {
+            app.showToast(res.data.msg);
+          }
         }
       },
       fail: () => {

public/appmini/old/baidu/pages/user-integral/user-integral.js

@@ -88,8 +88,9 @@ Page({
           this.setData({
             data_list_loding_status: 0
           });
-
-          app.showToast(res.data.msg);
+          if (app.is_login_check(res.data)) {
+            app.showToast(res.data.msg);
+          }
         }
       },
       fail: () => {

public/appmini/old/baidu/pages/user-order-comments/user-order-comments.js

@@ -56,7 +56,9 @@ Page({
             data_list_loding_status: 2,
             data_list_loding_msg: res.data.msg
           });
-          app.showToast(res.data.msg);
+          if (app.is_login_check(res.data)) {
+            app.showToast(res.data.msg);
+          }
         }
       },
       fail: () => {

public/appmini/old/baidu/pages/user-order-detail/user-order-detail.css

@@ -8,7 +8,7 @@
     padding: 10rpx 35rpx 10rpx 10rpx;
 }
 .address-detail .icon {
-    width: 35rpx;
+    width: 30rpx;
     height: 35rpx !important;
 }
 .address-detail .text {
@@ -138,6 +138,9 @@
   top: 0;
   right: 0;
 }
+.site-fictitious .panel-content .right-value .not-value {
+    margin-left: 10rpx;
+}
 
 /*
  * 自提信息

public/appmini/old/baidu/pages/user-order-detail/user-order-detail.swan

@@ -51,7 +51,7 @@
           <view s-if="{{(item.fictitious_goods_value || null) != null}}" class="rich-text-value">
             <rich-text nodes="{{item.fictitious_goods_value}}"></rich-text>
           </view>
-          <text s-else class="cr-888">未配置数据</text>
+          <text s-else class="cr-888 not-value">未配置数据</text>
         </view>
       </view>
     </view>

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

@@ -144,8 +144,9 @@ Page({
             data_list_loding_status: 0,
             load_status: 1
           });
-
-          app.showToast(res.data.msg);
+          if (app.is_login_check(res.data)) {
+            app.showToast(res.data.msg);
+          }
         }
       },
       fail: () => {
@@ -215,10 +216,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;
-            temp_data_list[index]['status_name'] = '待发货';
-            this.setData({ data_list: temp_data_list });
+            // 数据设置
+            self.order_item_pay_success_handle(index);
 
             app.showToast("支付成功", "success");
           } else {
@@ -226,10 +225,7 @@ Page({
               orderInfo: res.data.data.data,
               success: function (res) {
                 // 数据设置
-                var temp_data_list = self.data.data_list;
-                temp_data_list[index]['status'] = 2;
-                temp_data_list[index]['status_name'] = '待发货';
-                self.setData({ data_list: temp_data_list });
+                self.order_item_pay_success_handle(index);
 
                 // 跳转支付页面
                 swan.navigateTo({
@@ -252,6 +248,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) {
     swan.showModal({

public/appmini/old/baidu/pages/user-orderaftersale-detail/user-orderaftersale-detail.js

@@ -146,7 +146,9 @@ Page({
             data_bottom_line_status: false,
             data_list_loding_msg: res.data.msg
           });
-          app.showToast(res.data.msg);
+          if (app.is_login_check(res.data)) {
+            app.showToast(res.data.msg);
+          }
         }
       },
       fail: () => {

public/appmini/old/baidu/pages/user-orderaftersale/user-orderaftersale.js

@@ -126,8 +126,9 @@ Page({
             data_list_loding_status: 0,
             data_list_loding_msg: res.data.msg
           });
-
-          app.showToast(res.data.msg);
+          if (app.is_login_check(res.data)) {
+            app.showToast(res.data.msg);
+          }
         }
       },
       fail: () => {

public/appmini/old/baidu/pages/user/user.js

@@ -112,7 +112,9 @@ Page({
             common_app_is_head_vice_nav: data.common_app_is_head_vice_nav || 0,
           });
         } else {
-          app.showToast(res.data.msg);
+          if (app.is_login_check(res.data)) {
+            app.showToast(res.data.msg);
+          }
         }
       },
       fail: () => {

public/appmini/old/weixin/pages/user-order-detail/user-order-detail.wxss

@@ -8,7 +8,7 @@
     padding: 10rpx 35rpx 10rpx 10rpx;
 }
 .address-detail .icon {
-    width: 35rpx;
+    width: 30rpx;
     height: 35rpx !important;
 }
 .address-detail .text {