xiaohaizhao 7 mesiacov pred
rodič
commit
1cc9620e61

+ 0 - 1
packageA/orderForm/add/add.js

@@ -24,7 +24,6 @@ Page({
             this.getBrand();
             this.getDomain();
         }
-        getApp().globalData.Language.getLanguagePackage(this, 'E-订单');
     },
     /* 获取品牌 */
     getBrand(id) {

+ 0 - 1
packageA/orderForm/detail.js

@@ -67,7 +67,6 @@ Page({
                 })
             })
         })
-        getApp().globalData.Language.getLanguagePackage(this, 'E-订单');
     },
     /* 设置回签单 */
     changeSignbackstatus(e) {

+ 0 - 1
packageA/orderForm/index.js

@@ -41,7 +41,6 @@ Page({
         }]
     },
     onLoad(options) {
-        getApp().globalData.Language.getLanguagePackage(this, 'E-订单');
         this.setData({
             userrole: wx.getStorageSync('userrole')
         })

+ 3 - 2
packageA/orderForm/index.json

@@ -1,6 +1,7 @@
 {
   "usingComponents": {
     "List": "./modules/list/index",
-    "Float":"./add/float/index"
-  }
+    "Float": "./add/float/index"
+  },
+  "navigationBarTitleText": "销售订单"
 }

+ 0 - 1
packageA/orderForm/modules/setBrand/index.js

@@ -23,7 +23,6 @@ Page({
         domainList: res.data.tradefields,
       })
     })
-    getApp().globalData.Language.getLanguagePackage(this, 'E-订单');
   },
   /* 选择品牌 */
   onSelectBrand(e) {

+ 2 - 2
pages/tabbar/mine/index.js

@@ -42,7 +42,7 @@ Page({
             site: JSON.stringify(wx.getStorageSync('siteP')),
             templetList: JSON.stringify(wx.getStorageSync('templetList')),
             languagecode: wx.getStorageSync('languagecode'),
-            isWorderform: getApp().globalData.queryPer.query(wx.getStorageSync('userauth'), ['E-订单'], ['销售管理'])[0].apps.some(v => v.name == "worderform")
+            isnewsale: getApp().globalData.queryPer.query(wx.getStorageSync('userauth'), ['CRM'], ['销售管理'])[0].apps.some(v => v.name == "newsale")
         })
     },
     /* 查询用户信息 */
@@ -66,7 +66,7 @@ Page({
     },
     onShow() {
         this.getTabBar().init();
-        if (this.data.isWorderform) _Http.basic({
+        if (this.data.isnewsale) _Http.basic({
             "id": 2025030613432602,
             "content": {},
             "languagecode": "ZH",

+ 3 - 3
pages/tabbar/mine/index.wxml

@@ -12,8 +12,8 @@
         <van-icon size='40rpx' name="arrow" />
     </navigator>
 </view>
-<block wx:if="{{isWorderform}}">
-    <navigator class="orderForm" version='develop' target='miniProgram' app-id='wxc1b6ae925ac1d06a' path="{{'/packageA/orderForm/index'+'?auth='+auth+'&userMsg='+userMsg+'&site='+site+'&templetList='+templetList+'$languagecode='+languagecode}}" url="/packageA/orderForm/index" open-type="navigate">
+<block wx:if="{{isnewsale}}">
+    <navigator class="orderForm" url="/packageA/orderForm/index" open-type="navigate">
         <view class="left">
             <text class="work work-dingdan"></text>
             我的订单
@@ -24,7 +24,7 @@
     </navigator>
 
     <view class="orders" wx:if="{{orders.length}}">
-        <navigator class="stuta" version='develop' target='miniProgram' app-id='wxc1b6ae925ac1d06a' path="{{'/packageA/orderForm/index'+'?auth='+auth+'&userMsg='+userMsg+'&site='+site+'&templetList='+templetList+'$languagecode='+languagecode+'&stuta='+item.key}}" url="/packageA/orderForm/index" open-type="navigate" wx:for="{{orders}}" wx:key="key">
+        <navigator class="stuta" url="{{'/packageA/orderForm/index?stuta='+item.key}}" open-type="navigate" wx:for="{{orders}}" wx:key="key">
             <view class="iconfont {{item.icon}}">
                 <view class="badge" style="padding: {{item.badge>9?'0 4rpx':''}};" wx:if="{{item.badge}}">{{item.badge>99?'99+':item.badge}}</view>
             </view>

+ 2 - 3
utils/work/apps.js

@@ -22,9 +22,8 @@ function getapps() {
 		path: "/salesPanel/dataOverview/index",
 		icon: "work-shujutongji"
 	}];
-	let app = [...getApp().globalData.queryPer.query(wx.getStorageSync('userauth'), ['通用'], ['通用']),
-			...getApp().globalData.queryPer.query(wx.getStorageSync('userauth'), ['CRM'], ['业务管理']),
-			...getApp().globalData.queryPer.query(wx.getStorageSync('userauth'), ['数据统计'], ['数据分析'])
+	let app = [...getApp().globalData.queryPer.query(wx.getStorageSync('userauth'), ['通用'], ['通用', '工作汇报']),
+			...getApp().globalData.queryPer.query(wx.getStorageSync('userauth'), ['CRM'], ['业务管理', '数据统计'])
 		],
 		list = [];
 	app.forEach((v, i) => {