1、修改销售出库详情的问题

mixins/index.js

@@ -724,7 +724,6 @@ module.exports = {
   * @author : 姜永辉
   */
   toPay(e, closeFlag = true) {
-    console.log('re', e);
     let wechatPayService = app.globalData['wechatPayService']
     let params = {
       openId: app.globalData.openid,

package-basic-data/pages/register/company-register/company-register.js

@@ -25,7 +25,7 @@ Page({
     },
     flgPrimary: false,
     // 是否是专业版
-    proFlag:false,
+    proFlag: false,
     cardList: ['main'],
     contentObj: {
       main: [
@@ -49,10 +49,10 @@ Page({
    * @author : 周兴
    * @date : 2024/4/1
    */
-  changeTab(e){
-    if(e.detail.id == Constants.gradeCode.PRO){
+  changeTab(e) {
+    if (e.detail.id == Constants.gradeCode.PRO) {
       this.setData({
-        proFlag:true
+        proFlag: true
       })
     }
   },
@@ -261,18 +261,21 @@ Page({
     if (params.gradeCode == null) {
       params.gradeCode = Constants.gradeCode.STD
     }
-    let summaryInfo = this.data.summaryInfo
-    let curentAdItem = this.data.curentAdItem
-    params.webMaxNum = summaryInfo.webMaxNum
-    params.wxMaxNum = summaryInfo.wxMaxNum
-    params.endDate = summaryInfo.endDate
-    params.tradeNo = this.generateRandomNo();
-    params.wxUserId = app.globalData.user.userId
-    params.tradeAmount = summaryInfo.amount
-    params.buyBeginDate = summaryInfo.buyBeginDate;
-    params.buyEndDate = summaryInfo.endDate
-    params.extendDays = summaryInfo.extendDays;
-    params.buyLong = curentAdItem.activityItemName
+    // 专业版
+    if(this.data.proFlag){
+      let summaryInfo = this.data.summaryInfo
+      let curentAdItem = this.data.curentAdItem
+      params.webMaxNum = summaryInfo.webMaxNum
+      params.wxMaxNum = summaryInfo.wxMaxNum
+      params.endDate = summaryInfo.endDate
+      params.tradeNo = this.generateRandomNo();
+      params.wxUserId = app.globalData.user.userId
+      params.tradeAmount = summaryInfo.amount
+      params.buyBeginDate = summaryInfo.buyBeginDate;
+      params.buyEndDate = summaryInfo.endDate
+      params.extendDays = summaryInfo.extendDays;
+      params.buyLong = curentAdItem.activityItemName
+    }
     return params
   },
 
@@ -291,12 +294,17 @@ Page({
   * @author : 姜永辉
   */
   saveData() {
-    return this.excute(this.data.companyService, this.data.companyService.registerCompany, this.data.params).then(res => {
-      if (res.data.code == Constants.SUCESS_CODE) {
+    // 专业版，成功后需要跳转支付
+    if (this.data.proFlag) {
+      return this.excute(this.data.companyService, this.data.companyService.registerCompany, this.data.params).then(res => {
+        if (res.data.code == Constants.SUCESS_CODE) {
           // 成功后跳转支付
           this.toPay(res.data.data);
-      }
-  })
+        }
+      })
+    }else{
+      return this.excute(this.data.companyService, this.data.companyService.registerCompany, this.data.params)
+    }
   },
 
   /**
@@ -310,14 +318,14 @@ Page({
       return false
     }
     // 专业版必须要选择活动
-    if(this.data.proFlag){
-      if(!this.data.curentAdItem){
+    if (this.data.proFlag) {
+      if (!this.data.curentAdItem) {
         util.showToast('请选择活动');
         return false
       }
       // 必须要选择一个授权
       let staffCount = this.data.staffCount
-      if(!staffCount.maxNum && !staffCount.webMaxNum && !staffCount.wxMaxNum){
+      if (!staffCount.maxNum && !staffCount.webMaxNum && !staffCount.wxMaxNum) {
         util.showToast('请选择一个授权');
         return false
       }

pages/welcome/welcome.js

@@ -128,6 +128,13 @@ Page({
 
                 // 记录登录的缓存
                 app.globalData.company = data.company
+
+                // 说明注册未支付
+                if (!data.company.license) {
+                    // 成功后跳转支付
+                    // this.toPay(res.data.data);
+                }
+
                 app.globalData.user = {
                     userId: data.userId,
                     userName: data.userName,
@@ -208,12 +215,12 @@ Page({
                     let menuList = res.data.data.menuList
                     if (menuList) {
                         // 如果标准版把销售出库 修改为订单开单
-                        if(app.globalData.company.gradeCode == Constants.gradeCode.STD){
-                           let filters =  menuList.filter(it=>it.objectCode == 'order-out');
-                           if(filters && filters.length > 0){
-                            filters[0].menuName = '订单开单'
-                            filters[0].name = '订单开单'
-                           }
+                        if (app.globalData.company.gradeCode == Constants.gradeCode.STD) {
+                            let filters = menuList.filter(it => it.objectCode == 'order-out');
+                            if (filters && filters.length > 0) {
+                                filters[0].menuName = '订单开单'
+                                filters[0].name = '订单开单'
+                            }
                         }
                         app.globalData.menus = menuList
                     }
@@ -230,16 +237,16 @@ Page({
                     }
                     // 系统字典
                     let dataKindList = res.data.data.dataKindList
-                    if(dataKindList){
+                    if (dataKindList) {
                         app.globalData.dataKindList = dataKindList
                     }
-                }else{
+                } else {
                     // 报错跳转到登录界面
-                    setTimeout(()=>{
+                    setTimeout(() => {
                         wx.reLaunch({
                             url: '../../pages/login/login',
                         })
-                    },3000)
+                    }, 3000)
                 }
             })
         console.log('app.globalData', app.globalData);