wxd / MShopWeApp

Commit 6a482f5138f13c412172dbd208608fb6d3f4c75d

Authored by yvan.ni
1 parent 2c7dfbef

OA单优化

Inline Side-by-side
Showing 21 changed files with 54 additions and 102 deletions
packageA/pages/distribution/shop/shop.js
  View file @6a482f5
... ... @@ -79,14 +79,14 @@ Page({
79 79  
80 80 }
81 81  
82   - if (options?.brand_id) {
  82 + if (options && options.brand_id) {
83 83 this.setData({
84 84 brand_id: options.brand_id,
85 85 is_router:true
86 86 })
87 87 // this.getData(true, '/api/weshop/users/distribut/pagemyshop', this.data.currentQuery);
88 88 }
89   - if (options?.nation_id) {
  89 + if (options && options.nation_id) {
90 90 this.setData({
91 91 nation_id: options.nation_id,
92 92 is_router:true
... ...
packageC/pages/luckyGo/luckyGo_order/luckyGo_order.js
  View file @6a482f5
... ... @@ -1105,12 +1105,17 @@ Page({
1105 1105  
1106 1106 click_contact:function () {
1107 1107 getApp().globalData.no_clear=1;
  1108 + },
  1109 +
  1110 + //-- 查看物流 --
  1111 + go_wuliu:function (e) {
  1112 + getApp().go_wuliu(e);
1108 1113 }
1109   -
1110   -
1111   -
1112   -
1113   -
  1114 +
  1115 +
  1116 +
  1117 +
  1118 +
1114 1119  
1115 1120  
1116 1121  
... ...
packageC/pages/luckyGo/luckyGo_order/luckyGo_order.wxml
  View file @6a482f5
... ... @@ -185,7 +185,9 @@
185 185  
186 186 <view class="tips-btn" wx:if="{{order.order_status==3}}" bindtap="deleteOrderData" data-order_id="{{order.order_id}}" >删除订单</view>
187 187  
188   - <navigator class="tips-btn" hidden="{{!order.shipping_btn}}" url="/pages/user/express/express?order_id={{order.order_id}}">查看物流</navigator>
  188 + <navigator bindtap="go_wuliu" class="tips-btn" hidden="{{!order.shipping_btn}}"
  189 + data-order_id="{{order.order_id}}"
  190 + data-url="/pages/user/express/express?order_id={{order.order_id}}">查看物流</navigator>
189 191  
190 192 <!---has_rt部分退---->
191 193 <!-- <block wx:if="{{order.return_btn==undefined && order.is_all_return!=1 && order.has_rt!=1}}">
... ...
packageC/pages/presell/cart/cart.js
  View file @6a482f5
... ... @@ -3055,8 +3055,12 @@ Page({
3055 3055 var th = this;
3056 3056 th.setData({bn_use_commission: !th.data.bn_use_commission});
3057 3057 th.calculatePrice2();
3058   - }
  3058 + },
3059 3059  
  3060 + //-- 查看物流 --
  3061 + go_wuliu:function (e) {
  3062 + getApp().go_wuliu(e);
  3063 + }
3060 3064  
3061 3065  
3062 3066  
... ...
packageC/pages/presell/cart/cart.wxml
  View file @6a482f5
... ... @@ -396,7 +396,9 @@
396 396 </block>
397 397  
398 398 <view class="tips-btn2" wx:if="{{order.order_status==3}}" bindtap="deleteOrderData" data-order_id="{{order.order_id}}" >删除订单</view>
399   - <navigator class="tips-btn2" hidden="{{!order.shipping_btn}}" url="/pages/user/express/express?order_id={{order.order_id}}">查看物流</navigator>
  399 + <navigator bindtap="go_wuliu" class="tips-btn2" hidden="{{!order.shipping_btn}}"
  400 + data-order_id="{{order.order_id}}"
  401 + data-url="/pages/user/express/express?order_id={{order.order_id}}">查看物流</navigator>
400 402  
401 403  
402 404 <block wx:if="{{order.return_btn==undefined && order.is_all_return!=1}}">
... ...
packageD/pages/AI-test-skin/fail_result/fail_result.js
  View file @6a482f5
... ... @@ -28,19 +28,19 @@ Page({
28 28 * 生命周期函数--监听页面加载
29 29 */
30 30 onLoad: function (options) {
31   - if(options?.fail_result){
  31 + if(options && options.fail_result){
32 32 var fail_result = JSON.parse(options.fail_result);
33 33 this.setData({
34 34 fail_result,
35 35 })
36 36 }
37   - if(options?.msg){
  37 + if(options && options.msg){
38 38 this.setData({
39 39 msg:options.msg
40 40 })
41 41 }
42 42  
43   - if(options.ce_user_id) this.data.ce_user_id=options.ce_user_id;
  43 + if(options && options.ce_user_id) this.data.ce_user_id=options.ce_user_id;
44 44  
45 45 // msg=decodeURIComponent(msg);
46 46 // this.setData({msg:msg});
... ...
pages/cart/cart2_inte/c_filter.wxs renamed to packageE/pages/cart/cart2_inte/c_filter.wxs
  View file @6a482f5
pages/cart/cart2_inte/cart2_inte.js renamed to packageE/pages/cart/cart2_inte/cart2_inte.js
  View file @6a482f5
1   -var t = getApp(), app = t, a = t.request, e = require("../../../utils/common.js"),
2   - s = require("../../../utils/util.js"), ut = s, o = require("../../../utils/md5.js"), to = getApp();
  1 +var t = getApp(), app = t, a = t.request, e = require("../../../../utils/common.js"),
  2 + s = require("../../../../utils/util.js"), ut = s, o = require("../../../../utils/md5.js"), to = getApp();
3 3 var oo = t.globalData.setting, os = oo;
4   -var regeneratorRuntime = require('../../../utils/runtime.js');
5   -var util_pay = require("../../../utils/pay.js");
  4 +var regeneratorRuntime = require('../../../../utils/runtime.js');
  5 +var util_pay = require("../../../../utils/pay.js");
6 6  
7 7 Page({
8 8 data: {
... ...
pages/cart/cart2_inte/cart2_inte.json renamed to packageE/pages/cart/cart2_inte/cart2_inte.json
  View file @6a482f5
pages/cart/cart2_inte/cart2_inte.wxml renamed to packageE/pages/cart/cart2_inte/cart2_inte.wxml
  View file @6a482f5
1 1 <wxs module="filter" src="c_filter.wxs"></wxs>
2 2 <wxs src="filter.wxs" module="util"></wxs>
3   -<wxs module="filters" src="../../../utils/filter.wxs"></wxs>
  3 +<wxs module="filters" src="../../../../utils/filter.wxs"></wxs>
4 4  
5 5 <form bindsubmit="submitForm">
6 6 <view class="container">
... ...
pages/cart/cart2_inte/cart2_inte.wxss renamed to packageE/pages/cart/cart2_inte/cart2_inte.wxss
  View file @6a482f5
pages/cart/cart2_inte/filter.wxs renamed to packageE/pages/cart/cart2_inte/filter.wxs
  View file @6a482f5
pages/goods/goodsInfo/goodsInfo.js
  View file @6a482f5
... ... @@ -2358,7 +2358,7 @@ Page({
2358 2358  
2359 2359 if (e.prom_type == 4) {
2360 2360 s.set_b_now(e);
2361   - var url = "/pages/cart/cart2_inte/cart2_inte?is_bnow=1&goods_id=" + e.goods_id;
  2361 + var url = "/packageE/pages/cart/cart2_inte/cart2_inte?is_bnow=1&goods_id=" + e.goods_id;
2362 2362 getApp().goto(url);
2363 2363 } else {
2364 2364 //要判断积分购的普通购买有没有参加优惠活动
... ...
pages/test/test.js deleted
View file @2c7dfbe
1   -var ut = require("../../utils/util.js");
2   -var os=getApp().globalData.setting;
3   -
4   -var regeneratorRuntime = require('../../utils/runtime.js');
5   -
6   -Page({
7   - data:{
8   - store:null,
9   - imghots: os.imghost,
10   - msg:"",
11   - qyid:'wwc96c9375cd8d185a'
12   - },
13   -
14   - onLoad:function(t){
15   -
16   - var that=this;
17   -
18   - wx.qy.login({
19   - success: function (res) {
20   - //var qyid = that.data.qyid;
21   - var req_data = {
22   - js_code: res.code,
23   - //qyid: qyid
24   - };
25   -
26   -
27   - //调用接口获取userid
28   - getApp().request.promiseGet('/api/weshop/qywechat/getjscode2session', {
29   - data: req_data
30   - }).then(rs => {
31   - if (rs.data.code == 0) {
32   -
33   -
34   - wx.qy.getCurExternalChat ({
35   - success: function(res) {
36   - var chatId = res.chatId //返回当前外部群的群聊ID
37   -
38   - console.log(chatId);
39   - getApp().confirmBox(chatId+"---");
40   -
41   - }
42   - })
43   -
44   -
45   - }
46   - })
47   - }
48   - })
49   - },
50   -
51   -
52   -
53   -});
pages/test/test.json deleted
View file @2c7dfbe
1   -{}
2 0 \ No newline at end of file
pages/test/test.wxml deleted
View file @2c7dfbe
pages/test/test.wxss deleted
View file @2c7dfbe
1   -.all_page{
2   - position: fixed;
3   - height: 100%;
4   - width: 100%;
5   - background: #fff;
6   - justify-content: center;/*水平居中*/
7   -}
8   -.all_page .content{
9   - font-size: 30rpx;
10   - text-align: center;
11   - height: 400px;
12   - width: 100%;
13   - position: absolute;
14   - top: 50%;
15   - margin-top:-200px;
16   -}
17   -.logo{width: 140rpx; height: 140rpx; border-radius:50% }
18   -.all_page .content .title{
19   - font-size: 36rpx; margin: 20rpx 0
20   -}
21   -
22   -.all_page .err{
23   - color:red;
24   - font-size: 36rpx;
25   - margin-top: 300rpx;
26   -}
27 0 \ No newline at end of file
pages/user/order_detail/order_detail.js
  View file @6a482f5
... ... @@ -1767,9 +1767,17 @@ Page({
1767 1767  
1768 1768 click_contact:function () {
1769 1769 getApp().globalData.no_clear=1;
  1770 + },
  1771 +
  1772 +
  1773 + //-- 查看物流 --
  1774 + go_wuliu:function (e) {
  1775 + getApp().go_wuliu(e);
1770 1776 }
1771 1777  
1772 1778  
1773 1779  
1774 1780  
  1781 +
  1782 +
1775 1783 });
1776 1784 \ No newline at end of file
... ...
pages/user/order_detail/order_detail.wxml
  View file @6a482f5
... ... @@ -175,7 +175,9 @@
175 175 <view class="tips-btn" wx:if="{{order.order_status==3}}" bindtap="deleteOrderData" data-order_id="{{order.order_id}}" >删除订单</view>
176 176  
177 177  
178   - <navigator class="tips-btn" hidden="{{!order.shipping_btn}}" url="/pages/user/express/express?order_id={{order.order_id}}">查看物流</navigator>
  178 + <navigator bindtap="go_wuliu" class="tips-btn" hidden="{{!order.shipping_btn}}"
  179 + data-order_id="{{order.order_id}}"
  180 + data-url="/pages/user/express/express?order_id={{order.order_id}}">查看物流</navigator>
179 181  
180 182 <!---has_rt部分退---->
181 183 <block wx:if="{{order.return_btn==undefined && order.is_all_return!=1 && order.has_rt!=1}}">
... ...
pages/user/order_list/order_list.js
  View file @6a482f5
... ... @@ -2836,6 +2836,12 @@ Page({
2836 2836 },
2837 2837  
2838 2838  
  2839 + //-- 查看物流 --
  2840 + go_wuliu:function (e) {
  2841 + getApp().go_wuliu(e);
  2842 + }
  2843 +
  2844 +
2839 2845  
2840 2846  
2841 2847  
... ...
pages/user/order_list/order_list.wxml
  View file @6a482f5
... ... @@ -245,8 +245,11 @@
245 245 <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>
246 246 <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>
247 247 </block>
248   - <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>
249   - <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>
  248 +
  249 + <view bindtap="go_wuliu" class="commodity_To_evaluate flex-level View_evaluation" data-order_id="{{item.order_id}}"
  250 + 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>
  251 + <view bindtap="go_wuliu" class="commodity_To_evaluate flex-level View_evaluation" data-order_id="{{item.order_id}}"
  252 + 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>
250 253  
251 254 <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>
252 255 <navigator class="commodity_To_evaluate flex-level View_evaluation" url="{{item.ord_url}}?order_id={{item.order_id}}" wx:else>订单详情</navigator>
... ...