OA单优化

yvan.ni
1 parent 2c7dfbef
Showing 21 changed files with 54 additions and 102 deletions
packageA/pages/distribution/shop/shop.js
packageC/pages/luckyGo/luckyGo_order/luckyGo_order.js
packageC/pages/luckyGo/luckyGo_order/luckyGo_order.wxml
packageC/pages/presell/cart/cart.js
packageC/pages/presell/cart/cart.wxml
packageD/pages/AI-test-skin/fail_result/fail_result.js
pages/cart/cart2_inte/c_filter.wxs → packageE/pages/cart/cart2_inte/c_filter.wxs
pages/cart/cart2_inte/cart2_inte.js → packageE/pages/cart/cart2_inte/cart2_inte.js
pages/cart/cart2_inte/cart2_inte.json → packageE/pages/cart/cart2_inte/cart2_inte.json
pages/cart/cart2_inte/cart2_inte.wxml → packageE/pages/cart/cart2_inte/cart2_inte.wxml
pages/cart/cart2_inte/cart2_inte.wxss → packageE/pages/cart/cart2_inte/cart2_inte.wxss
pages/cart/cart2_inte/filter.wxs → packageE/pages/cart/cart2_inte/filter.wxs
pages/goods/goodsInfo/goodsInfo.js
pages/test/test.js
pages/test/test.json
pages/test/test.wxml
pages/test/test.wxss
pages/user/order_detail/order_detail.js
pages/user/order_detail/order_detail.wxml
pages/user/order_list/order_list.js
@@ -79,14 +79,14 @@ Page({
     }
-    if (options?.brand_id) {
+    if (options && options.brand_id) {
       this.setData({
         brand_id: options.brand_id,
         is_router:true
       })
       // this.getData(true, '/api/weshop/users/distribut/pagemyshop', this.data.currentQuery);
     }
-    if (options?.nation_id) {
+    if (options && options.nation_id) {
       this.setData({
         nation_id: options.nation_id,
         is_router:true
@@ -1105,12 +1105,17 @@ Page({
     click_contact:function () {
         getApp().globalData.no_clear=1;
+    },
+
+    //-- 查看物流 --
+    go_wuliu:function (e) {
+        getApp().go_wuliu(e);
     }
-		
-		
-		
-		
-		
+
+
+
+
+
@@ -185,7 +185,9 @@
 		<view class="tips-btn" wx:if="{{order.order_status==3}}"  bindtap="deleteOrderData" data-order_id="{{order.order_id}}" >删除订单</view>
-        <navigator class="tips-btn" hidden="{{!order.shipping_btn}}" url="/pages/user/express/express?order_id={{order.order_id}}">查看物流</navigator> 
+        <navigator bindtap="go_wuliu"  class="tips-btn" hidden="{{!order.shipping_btn}}"
+                   data-order_id="{{order.order_id}}"
+                   data-url="/pages/user/express/express?order_id={{order.order_id}}">查看物流</navigator>
           <!---has_rt部分退---->
          <!-- <block wx:if="{{order.return_btn==undefined && order.is_all_return!=1 && order.has_rt!=1}}">
@@ -3055,8 +3055,12 @@ Page({
         var th = this;
         th.setData({bn_use_commission: !th.data.bn_use_commission});
         th.calculatePrice2();
-    }
+    },
+    //-- 查看物流 --
+    go_wuliu:function (e) {
+        getApp().go_wuliu(e);
+    }
@@ -396,7 +396,9 @@
         </block>
         <view class="tips-btn2" wx:if="{{order.order_status==3}}"  bindtap="deleteOrderData" data-order_id="{{order.order_id}}" >删除订单</view>
-        <navigator class="tips-btn2" hidden="{{!order.shipping_btn}}" url="/pages/user/express/express?order_id={{order.order_id}}">查看物流</navigator>
+        <navigator bindtap="go_wuliu" class="tips-btn2" hidden="{{!order.shipping_btn}}"
+                   data-order_id="{{order.order_id}}"
+                   data-url="/pages/user/express/express?order_id={{order.order_id}}">查看物流</navigator>
         <block wx:if="{{order.return_btn==undefined && order.is_all_return!=1}}">
@@ -28,19 +28,19 @@ Page({
      * 生命周期函数--监听页面加载
      */
     onLoad: function (options) {
-        if(options?.fail_result){
+        if(options && options.fail_result){
             var fail_result = JSON.parse(options.fail_result);
             this.setData({
                 fail_result,
             })
         }
-        if(options?.msg){
+        if(options && options.msg){
             this.setData({
                 msg:options.msg
             })
         }
-        if(options.ce_user_id) this.data.ce_user_id=options.ce_user_id;
+        if(options && options.ce_user_id) this.data.ce_user_id=options.ce_user_id;
         // msg=decodeURIComponent(msg);
         // this.setData({msg:msg});
-var t = getApp(), app = t, a = t.request, e = require("../../../utils/common.js"),
-  s = require("../../../utils/util.js"), ut = s, o = require("../../../utils/md5.js"), to = getApp();
+var t = getApp(), app = t, a = t.request, e = require("../../../../utils/common.js"),
+  s = require("../../../../utils/util.js"), ut = s, o = require("../../../../utils/md5.js"), to = getApp();
 var oo = t.globalData.setting, os = oo;
-var regeneratorRuntime = require('../../../utils/runtime.js');
-var util_pay = require("../../../utils/pay.js");
+var regeneratorRuntime = require('../../../../utils/runtime.js');
+var util_pay = require("../../../../utils/pay.js");
 Page({
   data: {
 <wxs module="filter" src="c_filter.wxs"></wxs>
 <wxs src="filter.wxs" module="util"></wxs>
-<wxs module="filters" src="../../../utils/filter.wxs"></wxs>
+<wxs module="filters" src="../../../../utils/filter.wxs"></wxs>
 <form bindsubmit="submitForm">
 	<view class="container">
@@ -2358,7 +2358,7 @@ Page({
     if (e.prom_type == 4) {
       s.set_b_now(e);
-      var url = "/pages/cart/cart2_inte/cart2_inte?is_bnow=1&goods_id=" + e.goods_id;
+      var url = "/packageE/pages/cart/cart2_inte/cart2_inte?is_bnow=1&goods_id=" + e.goods_id;
       getApp().goto(url);
     } else {
       //要判断积分购的普通购买有没有参加优惠活动
-var ut = require("../../utils/util.js");
-var os=getApp().globalData.setting;
-
-var regeneratorRuntime = require('../../utils/runtime.js');
-
-Page({
-  data:{
-     store:null,
-     imghots: os.imghost,
-     msg:"",
-     qyid:'wwc96c9375cd8d185a'
-  },
-
-  onLoad:function(t){
-
-      var that=this;
-
-      wx.qy.login({
-          success: function (res) {
-              //var qyid = that.data.qyid;
-              var req_data = {
-                  js_code: res.code,
-                  //qyid: qyid
-              };
-
-
-              //调用接口获取userid
-              getApp().request.promiseGet('/api/weshop/qywechat/getjscode2session', {
-                  data: req_data
-              }).then(rs => {
-                  if (rs.data.code == 0) {
-
-
-                      wx.qy.getCurExternalChat ({
-                          success: function(res) {
-                              var chatId = res.chatId //返回当前外部群的群聊ID
-
-                              console.log(chatId);
-                              getApp().confirmBox(chatId+"---");
-
-                          }
-                      })
-
-
-                  }
-              })
-          }
-      })
-  },
-
-
-
-});
-{}
 \ No newline at end of file
-.all_page{
-  position: fixed;
-  height: 100%;
-  width: 100%;
-  background: #fff;
-  justify-content: center;/*水平居中*/
-}
-.all_page .content{
-  font-size: 30rpx;
-  text-align: center;
-  height: 400px;
-  width: 100%;
-  position: absolute; 
-  top: 50%;
-  margin-top:-200px;
-}
-.logo{width: 140rpx; height: 140rpx; border-radius:50% }
-.all_page .content .title{
-   font-size: 36rpx; margin: 20rpx 0
-}
-
-.all_page .err{
-    color:red;
-    font-size: 36rpx;
-    margin-top: 300rpx; 
-}
 \ No newline at end of file
@@ -1767,9 +1767,17 @@ Page({
     click_contact:function () {
         getApp().globalData.no_clear=1;
+    },
+
+
+    //-- 查看物流 --
+    go_wuliu:function (e) {
+        getApp().go_wuliu(e);
     }
+
+
 });
 \ No newline at end of file
@@ -175,7 +175,9 @@
 		<view class="tips-btn" wx:if="{{order.order_status==3}}"  bindtap="deleteOrderData" data-order_id="{{order.order_id}}" >删除订单</view>
-        <navigator class="tips-btn" hidden="{{!order.shipping_btn}}" url="/pages/user/express/express?order_id={{order.order_id}}">查看物流</navigator>
+        <navigator bindtap="go_wuliu" class="tips-btn" hidden="{{!order.shipping_btn}}"
+                   data-order_id="{{order.order_id}}"
+                   data-url="/pages/user/express/express?order_id={{order.order_id}}">查看物流</navigator>
           <!---has_rt部分退---->
          <block wx:if="{{order.return_btn==undefined && order.is_all_return!=1 && order.has_rt!=1}}">
@@ -2836,6 +2836,12 @@ Page({
   },
+  //-- 查看物流 --
+  go_wuliu:function (e) {
+      getApp().go_wuliu(e);
+  }
+
+
@@ -245,8 +245,11 @@
 	            <navigator class="commodity_To_evaluate flex-level View_evaluation" wx:if="{{item.is_all_return_status==3 && item.order_status<2}}" url="/pages/order/refund_order/refund_order?order_id={{item.order_id}}">重新退款</navigator>
 	            <navigator class="commodity_To_evaluate flex-level View_evaluation" wx:if="{{item.is_all_return_status==0 || item.is_all_return_status==1}}" url="/pages/user/return_goods_info/return_goods_info?order_id={{item.order_id}}">退款详情</navigator>
 	          </block>
-	          <navigator class="commodity_To_evaluate flex-level View_evaluation" hidden="{{!(item.exp_type==0&&item.pay_status==1&&item.shipping_status==1)}}" url="/pages/user/express/express?order_id={{item.order_id}}">查看物流</navigator>
-	          <navigator class="commodity_To_evaluate flex-level View_evaluation" hidden="{{!(item.exp_type==0&&item.pay_status==1&&item.shipping_status==2)}}" url="/pages/user/express/express?order_id={{item.order_id}}">查看物流</navigator>
+
+	          <view bindtap="go_wuliu" class="commodity_To_evaluate flex-level View_evaluation" data-order_id="{{item.order_id}}"
+					hidden="{{!(item.exp_type==0&&item.pay_status==1&&item.shipping_status==1)}}" data-url="/pages/user/express/express?order_id={{item.order_id}}">查看物流</view>
+	          <view bindtap="go_wuliu" class="commodity_To_evaluate flex-level View_evaluation" data-order_id="{{item.order_id}}"
+					hidden="{{!(item.exp_type==0&&item.pay_status==1&&item.shipping_status==2)}}" data-url="/pages/user/express/express?order_id={{item.order_id}}">查看物流</view>
 				<navigator class="commodity_To_evaluate flex-level View_evaluation" url="/packageC/pages/luckyGo/luckyGo_order/luckyGo_order?order_id={{item.order_id}}&&group_id={{item.order_goods[0].prom_id}}" wx:if="{{item.order_goods[0].prom_type==9}}">订单详情</navigator>	 
 			  <navigator class="commodity_To_evaluate flex-level View_evaluation" url="{{item.ord_url}}?order_id={{item.order_id}}" wx:else>订单详情</navigator>