zhaoxiaohai 3 rokov pred
rodič
commit
ae390021c3

+ 1 - 0
app.json

@@ -126,6 +126,7 @@
         }
     },
     "usingComponents": {
+        "My_Empty":"/components/My_empty/index",
         "Yl_Files": "/components/Yl_Files/index",
         "Yl_Tabbar": "/components/Yl_Tabbar/index",
         "Yl-tags": "/pages/tags/modules/Yl-tags/index",

+ 3 - 4
packageA/activity/detail.js

@@ -1,10 +1,7 @@
 const _Http = getApp().globalData.http;
 Page({
     data: {
-        isAdmin: wx.getStorageSync('auth').wmarketing_activity.options.some(v => v == "admin"), //是否具有管理权限
         isLeader: false, //是否为负责人
-        options: wx.getStorageSync('auth').wmarketing_activity.options, //权限列表
-
         tabsActive: 0, //tabs 选中项
         sat_campaignid: "",
         detail: '',
@@ -53,7 +50,9 @@ Page({
     },
     onLoad(options) {
         this.setData({
-            sat_campaignid: options.sat_campaignid
+            sat_campaignid: options.sat_campaignid,
+            isAdmin: wx.getStorageSync('auth').wmarketing_activity.options.some(v => v == "admin"), //是否具有管理权限
+            options: wx.getStorageSync('auth').wmarketing_activity.options, //权限列表
         });
         this.getDetail();
     },

+ 3 - 1
packageA/activity/index.js

@@ -6,7 +6,6 @@ Page({
      * 页面的初始数据
      */
     data: {
-        insert: wx.getStorageSync('auth').wmarketing_activity.options.some(v => v == 'insert'), //查询新增权限
         navList: [{
             label: "全部",
             icon: "icon-webxialaxuanxiangjiantou",
@@ -71,6 +70,9 @@ Page({
         }
     },
     onLoad(options) {
+        this.setData({
+            insert: wx.getStorageSync('auth').wmarketing_activity.options.some(v => v == 'insert'), //查询新增权限
+        })
         this.getList();
         this.getTypeList()
         this.getareaList()

+ 3 - 3
packageA/contract/detail.js

@@ -1,9 +1,7 @@
 const _Http = getApp().globalData.http;
 Page({
     data: {
-        isAdmin: wx.getStorageSync('auth').wcontract.options.some(v => v == "admin"), //是否具有管理权限
         isLeader: false, //是否为负责人
-        options: wx.getStorageSync('auth').wcontract.options, //权限列表
         tabsActive: 0, //tabs 选中项
         sa_contractid: "",
         tabsList: [{
@@ -14,7 +12,9 @@ Page({
     },
     onLoad(options) {
         this.setData({
-            sa_contractid: options.sa_contractid
+            sa_contractid: options.sa_contractid,
+            isAdmin: wx.getStorageSync('auth').wcontract.options.some(v => v == "admin"), //是否具有管理权限
+            options: wx.getStorageSync('auth').wcontract.options, //权限列表
         });
         this.getDetail();
     },

+ 3 - 1
packageA/contract/index.js

@@ -6,7 +6,6 @@ Page({
      * 页面的初始数据
      */
     data: {
-        insert: wx.getStorageSync('auth').wcontract.options.some(v => v == 'insert'), //查询新增权限
         typeList: [{
             name: '经销商合作协议',
             route: 'type1'
@@ -87,6 +86,9 @@ Page({
         }
     },
     onLoad(options) {
+        this.setData({
+            insert: wx.getStorageSync('auth').wcontract.options.some(v => v == 'insert'), //查询新增权限
+        })
         this.getList();
     },
     /* 获取列表 */

+ 3 - 3
packageA/offers/detail.js

@@ -1,9 +1,7 @@
 const _Http = getApp().globalData.http;
 Page({
     data: {
-        isAdmin: wx.getStorageSync('auth').woffer.options.some(v => v == "admin"), //是否具有管理权限
         isLeader: false, //是否为负责人
-        options: wx.getStorageSync('auth').woffer.options, //权限列表
         tabsActive: 1, //tabs 选中项
         sa_quotedpriceid: "",
         tabsList: [{
@@ -35,7 +33,9 @@ Page({
     },
     onLoad(options) {
         this.setData({
-            sa_quotedpriceid: options.sa_quotedpriceid
+            sa_quotedpriceid: options.sa_quotedpriceid,
+            isAdmin: wx.getStorageSync('auth').woffer.options.some(v => v == "admin"), //是否具有管理权限
+            options: wx.getStorageSync('auth').woffer.options, //权限列表
         });
         this.getDetail();
     },

+ 3 - 1
packageA/offers/index.js

@@ -6,7 +6,6 @@ Page({
      * 页面的初始数据
      */
     data: {
-        insert: wx.getStorageSync('auth').woffer.options.some(v => v == 'insert'), //查询新增权限
         typeList: [{
             name: '客户报价',
             index: 0
@@ -79,6 +78,9 @@ Page({
         }
     },
     onLoad(options) {
+        this.setData({
+            insert: wx.getStorageSync('auth').woffer.options.some(v => v == 'insert'), //查询新增权限
+        })
         this.getList();
     },
     /* 获取列表 */

+ 2 - 2
packageA/opponent/detail.js

@@ -1,7 +1,6 @@
 const _Http = getApp().globalData.http;
 Page({
     data: {
-        isAdmin: wx.getStorageSync('auth').wcompetitor.options.some(v => v == "admin"), //是否具有管理权限
         isLeader: false, //是否为负责人
         isShowTabbar: true, //是否显示底部
         tabsActive: 1, //tabs 选中项
@@ -39,7 +38,8 @@ Page({
     },
     onLoad(options) {
         this.setData({
-            sa_competitorid: options.id
+            sa_competitorid: options.id,
+            isAdmin: wx.getStorageSync('auth').wcompetitor.options.some(v => v == "admin"), //是否具有管理权限
         })
         this.getDetail();
     },

+ 3 - 1
packageA/opponent/index.js

@@ -5,7 +5,6 @@ Page({
      * 页面的初始数据
      */
     data: {
-        insert: wx.getStorageSync('auth').wcompetitor.options.some(v => v == 'insert'), //查询新增权限
         navList: [{
             label: "排序",
             icon: "icon-shengxu",
@@ -38,6 +37,9 @@ Page({
         }
     },
     onLoad(options) {
+        this.setData({
+            insert: wx.getStorageSync('auth').wcompetitor.options.some(v => v == 'insert'), //查询新增权限
+        })
         this.getList();
     },
     /* 获取列表 */

+ 3 - 4
packageA/project/detail.js

@@ -1,10 +1,7 @@
 const _Http = getApp().globalData.http;
 Page({
     data: {
-        isAdmin: wx.getStorageSync('auth').wCustomer.options.some(v => v == "admin"), //是否具有管理权限
         isLeader: false, //是否为负责人
-        options: wx.getStorageSync('auth').wCustomer.options, //权限列表
-
         tabsActive: 1, //tabs 选中项
         sa_projectid: "",
         tabsList: [{
@@ -45,7 +42,9 @@ Page({
     },
     onLoad(options) {
         this.setData({
-            sa_projectid: options.sa_projectid
+            sa_projectid: options.sa_projectid,
+            isAdmin: wx.getStorageSync('auth').wCustomer.options.some(v => v == "admin"), //是否具有管理权限
+            options: wx.getStorageSync('auth').wCustomer.options, //权限列表
         });
         this.getDetail()
     },

+ 3 - 1
packageA/project/index.js

@@ -3,7 +3,6 @@ const _Http = getApp().globalData.http,
 
 Page({
     data: {
-        insert: wx.getStorageSync('auth').wproject.options.some(v => v == 'insert'), //查询新增权限
         listHeight: null,
         navList: [{
             label: "全部",
@@ -75,6 +74,9 @@ Page({
         }
     },
     onLoad(options) {
+        this.setData({
+            insert: wx.getStorageSync('auth').wproject.options.some(v => v == 'insert'), //查询新增权限
+        })
         this.getList();
         //获取所有阶段
         this.getStage();

+ 2 - 3
packageA/publicClue/detail.js

@@ -1,9 +1,7 @@
 const _Http = getApp().globalData.http;
 Page({
     data: {
-        isAdmin: wx.getStorageSync('auth').wCustomer.options.some(v => v == "admin"), //是否具有管理权限
         isLeader: false, //是否为负责人
-
         tabsActive: 0, //tabs 选中项
         sat_orderclueid: "",
         detail: '',
@@ -36,7 +34,8 @@ Page({
     },
     onLoad(options) {
         this.setData({
-            sat_orderclueid: options.sat_orderclueid
+            sat_orderclueid: options.sat_orderclueid,
+            isAdmin: wx.getStorageSync('auth').wCustomer.options.some(v => v == "admin"), //是否具有管理权限
         });
         this.getDetail();
     },

+ 3 - 1
packageA/publicClue/index.js

@@ -6,7 +6,6 @@ Page({
      * 页面的初始数据
      */
     data: {
-        insert: wx.getStorageSync('auth').worderclue_public.options.some(v => v == 'insert'), //查询新增权限
         allot: wx.getStorageSync('auth').worderclue_public.options.some(v => v == 'allot'), //分配
         navList: [{
             label: "全部",
@@ -48,6 +47,9 @@ Page({
         }
     },
     onLoad(options) {
+        this.setData({
+            insert: wx.getStorageSync('auth').worderclue_public.options.some(v => v == 'insert'), //查询新增权限
+        })
         this.getList();
         // this.getTypeList()
     },

+ 3 - 3
packageA/publicCustomer/detail.js

@@ -1,9 +1,7 @@
 const _Http = getApp().globalData.http;
 Page({
     data: {
-        isAdmin: wx.getStorageSync('auth').wPublicCustomer.options.some(v => v == "admin"), //是否具有管理权限
         isLeader: false, //是否为负责人
-        options: wx.getStorageSync('auth').wPublicCustomer.options, //权限列表
         tabsActive: 1, //tabs 选中项
         sa_customersid: 0,
         detail: {}, //详情数据
@@ -39,7 +37,9 @@ Page({
     },
     onLoad(options) {
         this.setData({
-            sa_customersid: options.id
+            sa_customersid: options.id,
+            isAdmin: wx.getStorageSync('auth').wPublicCustomer.options.some(v => v == "admin"), //是否具有管理权限
+            options: wx.getStorageSync('auth').wPublicCustomer.options, //权限列表
         })
         this.getDetail();
     },

+ 1 - 1
packageA/publicCustomer/detail.wxml

@@ -9,7 +9,7 @@
             </view>
         </view>
         <view class="extend">
-            <Info />
+            <!-- <Info /> -->
         </view>
     </view>
 </view>

+ 3 - 2
packageA/publicCustomer/index.js

@@ -2,7 +2,6 @@ const _Http = getApp().globalData.http,
     getHeight = require("../../utils/getRheRemainingHeight");
 Page({
     data: {
-        insert: wx.getStorageSync('auth').wPublicCustomer.options.some(v => v == 'insert'), //查询新增权限
         navList: [{
             label: "全部",
             icon: "icon-webxialaxuanxiangjiantou",
@@ -42,7 +41,9 @@ Page({
         }
     },
     onLoad(options) {
-
+        this.setData({
+            insert: wx.getStorageSync('auth').wPublicCustomer.options.some(v => v == 'insert'), //查询新增权限
+        })
         this.getList();
         this.getType();
     },

+ 2 - 2
packageA/saleClue/detail.js

@@ -1,7 +1,6 @@
 const _Http = getApp().globalData.http;
 Page({
     data: {
-        isAdmin: wx.getStorageSync('auth').wCustomer.options.some(v => v == "admin"), //是否具有管理权限
         isLeader: false, //是否为负责人
         tabsActive: 0, //tabs 选中项
         sat_orderclueid: "",
@@ -29,7 +28,8 @@ Page({
     },
     onLoad(options) {
         this.setData({
-            sat_orderclueid: options.sat_orderclueid
+            sat_orderclueid: options.sat_orderclueid,
+            isAdmin: wx.getStorageSync('auth').wCustomer.options.some(v => v == "admin"), //是否具有管理权限
         });
         this.getDetail();
     },

+ 3 - 1
packageA/saleClue/index.js

@@ -6,7 +6,6 @@ Page({
      * 页面的初始数据
      */
     data: {
-        insert: wx.getStorageSync('auth').worderclue.options.some(v => v == 'insert'), //查询新增权限
         navList: [{
             label: "全部",
             icon: "icon-webxialaxuanxiangjiantou",
@@ -48,6 +47,9 @@ Page({
         }
     },
     onLoad(options) {
+        this.setData({
+            insert: wx.getStorageSync('auth').worderclue.options.some(v => v == 'insert'), //查询新增权限
+        })
         this.getList()
         this.getTypeList()
         this.getClueArea()

+ 2 - 2
packageA/salesForecasting/detail.js

@@ -1,7 +1,6 @@
 const _Http = getApp().globalData.http;
 Page({
     data: {
-        admin: wx.getStorageSync('auth').forecast.options.some(v => v == 'admin'), //查询管理
         isLeader: false, //是否负责人
         tabsActive: 1, //tabs 选中项
         sa_salesforecastbillid: "",
@@ -37,7 +36,8 @@ Page({
     },
     onLoad(options) {
         this.setData({
-            sa_salesforecastbillid: options.sa_salesforecastbillid
+            sa_salesforecastbillid: options.sa_salesforecastbillid,
+            admin: wx.getStorageSync('auth').forecast.options.some(v => v == 'admin'), //查询管理
         });
         this.getDetail(true);
     },

+ 2 - 3
packageA/salesForecasting/modules/list/index.wxml

@@ -1,17 +1,16 @@
 <My_empty wx:if="{{list.length==0}}" />
 <navigator class="offer-list" url="/packageA/salesForecasting/detail?sa_salesforecastbillid={{item.sa_salesforecastbillid}}" wx:for="{{list}}" wx:key="item.billnum">
     <view class="title">
-        <text class="line-1">{{item.title}}</text>
+        <text class="line-1">单号:{{item.billnum}}</text>
         <view class="status" style="background-color: {{backColor.getColor(item.status)}};">{{item.status}}</view>
     </view>
     <view class="tag-box">
         <van-tag custom-class='tag' wx:for="{{item.tags.systemtag}}" wx:for-item='tag' color='#FA8C16' text-color='#fff' round>{{tag}}</van-tag>
         <van-tag custom-class='tag' wx:for="{{item.tags.datatag}}" wx:for-item='tag' color='#FAAB16' text-color='#fff' round>{{tag}}</van-tag>
     </view>
-    <view class="exp line-1">单号:{{item.billnum}}</view>
+    <view class="exp line-1">提报要求:<text>{{item.remarks}}</text></view>
     <view class="exp line-1">提报开始时间:<text>{{item.periodstart}}</text></view>
     <view class="exp line-1">提报周期:<text>{{item.reportingperiod}}</text></view>
-    <view class="exp line-1">提报要求:<text>{{item.remarks}}</text></view>
     <view class="exp line-1">预测金额:<text>{{item.amount}}</text></view>
 </navigator>
 

+ 3 - 3
packageA/setclient/detail.js

@@ -1,9 +1,7 @@
 const _Http = getApp().globalData.http;
 Page({
     data: {
-        isAdmin: wx.getStorageSync('auth').wCustomer.options.some(v => v == "admin"), //是否具有管理权限
         isLeader: false, //是否为负责人
-        options: wx.getStorageSync('auth').wCustomer.options, //权限列表
         tabsActive: 0, //tabs 选中项
         sa_customersid: 0,
         detail: {}, //详情数据
@@ -39,7 +37,9 @@ Page({
     },
     onLoad(options) {
         this.setData({
-            sa_customersid: options.id
+            sa_customersid: options.id,
+            isAdmin: wx.getStorageSync('auth').wCustomer.options.some(v => v == "admin"), //是否具有管理权限
+            options: wx.getStorageSync('auth').wCustomer.options, //权限列表
         })
         this.getDetail();
     },

+ 1 - 1
packageA/setclient/detail.wxml

@@ -9,7 +9,7 @@
             </view>
         </view>
         <view class="extend">
-            <Info />
+            <!-- <Info /> -->
         </view>
     </view>
 </view>

+ 3 - 1
packageA/setclient/index.js

@@ -2,7 +2,6 @@ const _Http = getApp().globalData.http,
     getHeight = require("../../utils/getRheRemainingHeight");
 Page({
     data: {
-        insert: wx.getStorageSync('auth').wCustomer.options.some(v => v == 'insert'), //查询新增权限
         navList: [{
             label: "全部",
             icon: "icon-webxialaxuanxiangjiantou",
@@ -77,6 +76,9 @@ Page({
         })
     },
     onLoad(options) {
+        this.setData({
+            insert: wx.getStorageSync('auth').wCustomer.options.some(v => v == 'insert'), //查询新增权限
+        })
         this.getList()
     },
     /* 筛选状态选择 */

+ 1 - 0
pages/tabbar/home/index.js

@@ -276,6 +276,7 @@ Page({
                 };
             });
             wx.setStorageSync('auth', authList)
+            console.log(wx.getStorageSync('auth'))
             gridList.push({
                 name: "联系人",
                 path: "/packageA/contacts/index",

+ 4 - 1
utils/Http.js

@@ -1,5 +1,8 @@
 // const baseUrl = "https://meida.cnyunl.com/yos/rest/index";
-const baseUrl = "http://61.164.207.46:8000/yos/rest/index";
+// const baseUrl = "http://61.164.207.46:8000/yos/rest/index";
+const baseUrl = "http://122.226.136.204:8082/yos/rest/index";
+
+
 let count = null;
 class HTTP {
     request({