注册商户

api/pages/other/company.js

@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright(c) 2024 dongke All rights reserved. / Confidential
+ * 类的信息：
+ *		1.程序名称：
+ *		2.功能描述：公司
+ * 编辑履历：
+ *		作者				日期					版本				修改内容
+ *		jyh		  	     2024-1-19       			1.00		       	新建
+ *******************************************************************************/
+module.exports = {
+    companyService: {
+        // 前缀
+        prefix: 'oauth-server/company/',
+
+    },
+
+    routeUrl: {
+        company: {
+           
+        }
+    }
+};

app.js

@@ -10,6 +10,7 @@ import './mixins/mixins.js';
 // api/pages中的路由服务文件
 const common = require( './api/pages/common/common.js');
 const setting = require('./api/pages/other/setting.js');
+const company = require('./api/pages/other/company.js');
 const user = require('./api/pages/core/user.js');
 const staff = require('./api/pages/mst/staff.js');
 const staffRight = require('./api/pages/mst/staffRight.js');
@@ -30,7 +31,7 @@ const goodsSku = require('./api/pages/mst/goodsSku.js');
 const basicData = require('./api/pages/mst/basicData.js');
 
 // api服务路由文件
-var apiList = [common,setting,user,staff,staffRight,staffPurview,customer,role,roleFun,org,roleSensitive,goodsBrand,goodsCategory,goodsSeries,unit,supplier,warehouse,saleChannel,goodsSku,basicData]
+var apiList = [common,setting,company,user,staff,staffRight,staffPurview,customer,role,roleFun,org,roleSensitive,goodsBrand,goodsCategory,goodsSeries,unit,supplier,warehouse,saleChannel,goodsSku,basicData]
 
 const util = require('./utils/util.js')
 const baseMethod = require('./api/pages/baseMethod.js')

components/dkbase/dk-form/dk-form.js

@@ -362,9 +362,9 @@ Component({
      */
     changeTabs(e){
       let key = e.currentTarget.dataset.key
-      let checkFlag = e.currentTarget.dataset.value
+      let id = e.detail.id
       let form = this.data.form
-      form[key] = checkFlag
+      form[key] = id 
       this.setData({
         value: JSON.stringify(form),
         form: form

components/dkbase/dk-form/dk-form.wxml

@@ -4,8 +4,7 @@
   <view class="dk-card-class" wx:for="{{cardList}}" wx:for-item="card" data-item="{{card}}">
     <view wx:for="{{contentObj[card]}}" wx:for-item="item" data-item="{{item}}" wx:key="index">
       <!--文本框-->
-      <van-field wx:if="{{item.type=='str' && !item.hide}}" label-class="{{item.required?'red-label':'nomal-label' }}" data-key="{{item.code}}"
-      data-item="{{item}}" data-index="{{index}}" data-card="{{card}}" value="{{ form[item.code]}}" input-align="left" label="{{item.title?item.title:$t[item.code]}}" placeholder="{{wxmlUtil.setPlaceholder($t,item.title?item.title:item.code)}}" autosize border="{{ false }}" readonly="{{!!item.readonly}}" input-class="dk-cell-value-class" maxlength="{{item.maxlength?item.maxlength:50}}" right-icon="{{item.rightIcon}}" bind:change="changeField" errorMessage="{{item.errMsg}}">
+      <van-field wx:if="{{item.type=='str' && !item.hide}}" label-class="{{item.required?'red-label':'nomal-label' }}" data-key="{{item.code}}" data-item="{{item}}" data-index="{{index}}" data-card="{{card}}" value="{{ form[item.code]}}" input-align="left" label="{{item.title?item.title:$t[item.code]}}" placeholder="{{wxmlUtil.setPlaceholder($t,item.title?item.title:item.code)}}" autosize border="{{ false }}" readonly="{{!!item.readonly}}" input-class="dk-cell-value-class" maxlength="{{item.maxlength?item.maxlength:50}}" right-icon="{{item.rightIcon}}" bind:change="changeField" errorMessage="{{item.errMsg}}">
       </van-field>
       <!--单选下拉-->
       <van-field wx:if="{{item.type=='drop' && !item.hide}}" label-class="{{item.required?'red-label':'nomal-label' }}" data-name="{{item.name}}" data-key="{{item.code}}" data-item="{{item}}" data-index="{{index}}" data-card="{{card}}" value="{{ form[item.name]}}" input-align="left" label="{{item.title?item.title:$t[item.code]}}" placeholder="{{wxmlUtil.setPlaceholder($t,item.title?item.title:item.code)}}" is-link catchtap="open" autosize border="{{ false }}" readonly="{{true}}" input-class="dk-cell-value-class" data-type='{{item.dropType}}' errorMessage="{{item.errMsg}}">
@@ -15,20 +14,20 @@
       </van-field>
       <!--选单-->
       <van-field wx:if="{{item.type=='choose'}}" label-class="{{item.required?'red-label':'nomal-label' }}" data-name="{{item.name}}" data-key="{{item.code}}" data-item="{{item}}" data-index="{{index}}" data-card="{{card.name}}" value="{{ form[item.name]}}" input-align="left" label="{{item.title?item.title:$t[item.code]}}" placeholder="{{item.placeholder ? item.placeholder : wxmlUtil.setPlaceholder($t, item.title?item.title:item.code)}}" is-link catchtap="open" autosize border="{{ false }}" readonly="{{true}}" input-class="dk-cell-value-class" data-type='{{item.dropType}}' errorMessage="{{item.errMsg}}">
-        </van-field>
+      </van-field>
       <!--选择框-->
       <van-field wx:if="{{item.type=='checkbox' && !item.hide}}" input-width="200rpx" input-class="dk-cell-value-class" label-class="nomal-label" input-align="left" value="{{ form[item.code] ? '  需要' : '  不需要' }}" label="{{item.title?item.title:$t[item.code]}}" autosize border="{{ false }}" readonly="{{true}}" errorMessage="{{item.errMsg}}">
         <view slot="inputbefor" style="text-align: left;padding-left: 10rpx;" data-item="{{item}}" data-index="{{index}}" data-card="{{card}}" data-value="{{form[item.code]}}" data-key="{{item.code}}" catchtap="changeCheckBox">
           <van-checkbox shape="round" value="{{form[item.code]}}" />
         </view>
       </van-field>
-       <!--tab标签-->
-       <van-field wx:if="{{item.type=='tabs' && !item.hide}}" input-width="200rpx" input-class="dk-cell-value-class" label-class="nomal-label" input-align="left" value="{{ form[item.code]  }}" label="{{item.title?item.title:$t[item.code]}}" autosize border="{{ false }}" readonly="{{true}}" errorMessage="{{item.errMsg}}">
-        <view slot="inputbefor" style="text-align: left;padding-left: 10rpx;" data-item="{{item}}" data-index="{{index}}" data-card="{{card}}" data-value="{{form[item.code]}}" data-key="{{item.code}}" catchtap="changeCheckBox"> 
-          <dk-tabs-custom   model:value="{{form[item.code]}}" data-filterindex="1" data-querytype="staffHelper" bind:change="changeTabs" list="{{item.tagList}}" />
+      <!--tab标签-->
+      <van-field wx:if="{{item.type=='tabs' && !item.hide}}" input-width="200rpx" input-class="dk-cell-value-class" label-class="nomal-label" input-align="left" label="{{item.title?item.title:$t[item.code]}}" autosize border="{{ false }}" readonly="{{true}}" errorMessage="{{item.errMsg}}">
+        <view slot="inputbefor" style="text-align: left;padding-left: 10rpx;" data-item="{{item}}" data-index="{{index}}" data-card="{{card}}" data-value="{{form[item.code]}}" data-key="{{item.code}}" catchtap="changeTabs">
+          <dk-tabs-custom model:value="{{form[item.code]}}" bind:change="changeTabs" data-key="{{item.code}}" list="{{item.tagList}}" />
         </view>
       </van-field>
-      
+
       <!--客户地址-->
       <van-field wx:if="{{item.type=='address' && !item.hide}}" input-width="200rpx" input-class="dk-cell-value-class" label-class="{{item.required?'red-label':'nomal-label' }}" input-align="left" data-key="address" type="textarea" value="{{ wxmlUtil.addressToIndexOf(form.address.address) }}" label="{{item.title?item.title:$t[item.code]}}" placeholder="{{wxmlUtil.setPlaceholder($t,item.title?item.title:item.code)}}" autosize border="{{ false }}" right-icon="location" data-type='address' catchtap="onClickWxchartAddress" readonly="{{true}}" data-item="{{item}}" data-index="{{index}}" data-card="{{card}}" errorMessage="{{item.errMsg}}">
       </van-field>

i18n/zh-CN.js

@@ -1,138 +1,139 @@
 // 按钮
 const button = {
- add:'新建',
- cancel:'取消',
- search:'搜索',
- enable:'启用',
- disable:'停用',
- allEnable:'全部启用',
- allDisable:'全部停用',
- allEnableVisible:'全部启用可见',
- allDisableVisible:'全部启用可见',
- enableDisable:'启用/停用',
- copyAndAdd:'复制新增',
- delete:'删除',
- setUp:'已设置',
- notSet:'未设置',
- all:'全部',
- resignation:'在职',
- leaveOffice:'离职',
- flgCanLogin:'登录标识',
- parent:'父级',
+  add: '新建',
+  cancel: '取消',
+  search: '搜索',
+  enable: '启用',
+  disable: '停用',
+  allEnable: '全部启用',
+  allDisable: '全部停用',
+  allEnableVisible: '全部启用可见',
+  allDisableVisible: '全部启用可见',
+  enableDisable: '启用/停用',
+  copyAndAdd: '复制新增',
+  delete: '删除',
+  setUp: '已设置',
+  notSet: '未设置',
+  all: '全部',
+  resignation: '在职',
+  leaveOffice: '离职',
+  flgCanLogin: '登录标识',
+  parent: '父级',
 }
 
 //  首页
 const home = {
-  currentWeek:'本周',
-  currentMonth:'本月',
-  transactionAmount:'成交额',
-  collectionAmount:'收款额',
-  registerCommany:'注册商户',
-  settingCommany:'商户设置',
-  standardVersion :'标准版',
-  flagshipVersion :'旗舰版',
-  professionalVersion :'专业版',
-  activateProduct :'开通产品',
+  currentWeek: '本周',
+  currentMonth: '本月',
+  transactionAmount: '成交额',
+  collectionAmount: '收款额',
+  registerCommany: '注册商户',
+  settingCommany: '商户设置',
+  standardVersion: '标准版',
+  flagshipVersion: '旗舰版',
+  professionalVersion: '专业版',
+  gradeCode: '开通产品',
   recommendedGifts: '推荐有礼',
   companyName: '公司名称',
-  headName: '负责人',
-  userCount:'公司规模',
-  shopCount:'门店规模',
-  communicationFeedback:'沟通反馈',
+  cpManager: '负责人',
+  cpPhone: '联系电话',
+  cpSize: '公司规模',
+  shopSize: '门店规模',
+  feedback: '沟通反馈',
 }
 
 //  基础数据
 const basicData = {
-  staffCode:'员工编码',
-  staffPhone:'员工电话',
-  staffName:'员工姓名',
-  orgId:'业务部门',
-  roleId:'所属角色',
-  roleName:'角色名称',
-  roleCode:'角色编码',
-  roleRemarks:'角色说明',
-  roleFunName:'功能名称',
-  sensitiveName:'数据名称',
-  functionalPermissions:'功能权限',
-  purviewPermissions:'范围权限',
-  sensitiveData:'敏感数据',
-  roleAdd:'新建角色',
-  roleEdit:'编辑角色',
-  staffAdd:'新建员工',
-  staffEdit:'编辑员工',
-  brandCode:'品牌编码',
-  brandName:'品牌名称',
-  goodsBrand:'商品品牌',
-  goodsCategory:'商品种类',
-  goodsSeries:'商品系列',
-  unit:'计量单位',
-  seriesCode:'系列编码',
-  seriesName:'系列名称',
-  unitCode:'单位编码',
-  unitName:'单位名称',
-  decimalPlaces:'小数位数',
-  decimalPlacesNumber:'小数：',
-  catCode:'种类编码',
-  catName:'种类名称',
-  catName:'种类名称',
+  staffCode: '员工编码',
+  staffPhone: '员工电话',
+  staffName: '员工姓名',
+  orgId: '业务部门',
+  roleId: '所属角色',
+  roleName: '角色名称',
+  roleCode: '角色编码',
+  roleRemarks: '角色说明',
+  roleFunName: '功能名称',
+  sensitiveName: '数据名称',
+  functionalPermissions: '功能权限',
+  purviewPermissions: '范围权限',
+  sensitiveData: '敏感数据',
+  roleAdd: '新建角色',
+  roleEdit: '编辑角色',
+  staffAdd: '新建员工',
+  staffEdit: '编辑员工',
+  brandCode: '品牌编码',
+  brandName: '品牌名称',
+  goodsBrand: '商品品牌',
+  goodsCategory: '商品种类',
+  goodsSeries: '商品系列',
+  unit: '计量单位',
+  seriesCode: '系列编码',
+  seriesName: '系列名称',
+  unitCode: '单位编码',
+  unitName: '单位名称',
+  decimalPlaces: '小数位数',
+  decimalPlacesNumber: '小数：',
+  catCode: '种类编码',
+  catName: '种类名称',
+  catName: '种类名称',
   //基础资料
-  warehouse:'仓库档案',
-  saleChannel:'销售渠道',
-  incomeCategory:'收入类别',
-  expenditureCategory:'支出类别',
-  reasonStorage:'入库原因',
-  reasonOutbound:'出库原因',
-  accountCategory:'账户类别',
-  customerSource:'客户来源',
-  customerlabel:'客户标签',
-  whCode:'仓库编码',
-  whName:'仓库名称',
-  supervisor:'仓库主管',
-  channelCode:'渠道编码',
-  channelName:'渠道名称',
+  warehouse: '仓库档案',
+  saleChannel: '销售渠道',
+  incomeCategory: '收入类别',
+  expenditureCategory: '支出类别',
+  reasonStorage: '入库原因',
+  reasonOutbound: '出库原因',
+  accountCategory: '账户类别',
+  customerSource: '客户来源',
+  customerlabel: '客户标签',
+  whCode: '仓库编码',
+  whName: '仓库名称',
+  supervisor: '仓库主管',
+  channelCode: '渠道编码',
+  channelName: '渠道名称',
 }
 
 
 // 列
 const columns = {
-  null:'',
-  test:'测试',
-  followCount:'跟进次数',
-  nextFollowTime:'跟进提醒',
-  follow:'客户跟进',
-  customerName:'客户名称', 
-  address:'地址',
-  customTags:'标签',
-  telephone:'电话',
-  remarks:'备注',
+  null: '',
+  test: '测试',
+  followCount: '跟进次数',
+  nextFollowTime: '跟进提醒',
+  follow: '客户跟进',
+  customerName: '客户名称',
+  address: '地址',
+  customTags: '标签',
+  telephone: '电话',
+  remarks: '备注',
   //采购列表筛选
-  contactName:'收货人',
-  contactPhones:'收货电话',
-  addressFull:'收货地址',
-  makingTime:'采购日期',
-  deliveryTime:'预计发货日期',
-  noCollect:'未收款',
-  collect:'已收款',
-  staffId:'业务员',
-  customer :'客户',
-  supplier:'供应商',
-  collectType:'收入类别',
-  warehouseId:'仓库'
+  contactName: '收货人',
+  contactPhones: '收货电话',
+  addressFull: '收货地址',
+  makingTime: '采购日期',
+  deliveryTime: '预计发货日期',
+  noCollect: '未收款',
+  collect: '已收款',
+  staffId: '业务员',
+  customer: '客户',
+  supplier: '供应商',
+  collectType: '收入类别',
+  warehouseId: '仓库'
 }
 //销售订单
 const saleOrder = {
-  delivery_Time:'送货日期',
-  orderNo:'单号',
-  adddress:'地址',
-  contractNumber:'合同号',
+  delivery_Time: '送货日期',
+  orderNo: '单号',
+  adddress: '地址',
+  contractNumber: '合同号',
 }
 //资金管理
-const accountsManage = { 
-  availableBalance:'可用余额',
-  totalWriteOffAmount:'核销总额',
-  totalWriteOffOrder:'核销单据',
-  payment:'付款',
-  collection:'收款',
+const accountsManage = {
+  availableBalance: '可用余额',
+  totalWriteOffAmount: '核销总额',
+  totalWriteOffOrder: '核销单据',
+  payment: '付款',
+  collection: '收款',
 
 }
 // 提示信息
@@ -141,61 +142,61 @@ const messages = {
 
 // 其他信息
 const others = {
-  pastThirthtyDays:'近30天',
+  pastThirthtyDays: '近30天',
   inputWords: '请输入',
-  searchWords:'请选择',
-  nodata:'暂无数据',
-  loading:'加载中',
-  noMore:'到底了',
-  chose:'选',
-  together:'共',
-  bill:'单',
+  searchWords: '请选择',
+  nodata: '暂无数据',
+  loading: '加载中',
+  noMore: '到底了',
+  chose: '选',
+  together: '共',
+  bill: '单',
 }
 // 组织机构
 const org = {
-  parentName:'上级部门',
-  orgCode:'部门编码',
-  orgName:'部门名称',
-  newDepartment:'新建部门',
-  newSubOrg:'新建子部门',
-  newStaff:'新建员工',
-  
+  parentName: '上级部门',
+  orgCode: '部门编码',
+  orgName: '部门名称',
+  newDepartment: '新建部门',
+  newSubOrg: '新建子部门',
+  newStaff: '新建员工',
+
 }
 // 供应商
 const supplier = {
-  supplierCode:'供应商编码',
-  supplierName:'供应商名称', 
-  supplierType:'供应商类别', 
-  brandId:'供应品牌', 
-  contactPhone:'联系电话', 
-  contactName:'联系人', 
-  procureStaff:'采购人员',
-  ServiceCategories:'服务类别',
-  supplierAdd:"新建供应商",
-  supplierEdit:"编辑供应商",
-  procurementSupplier:"采购供应商",
-  serviceProvider:"服务供应商", 
-  meet:"应付",
-  save:'保存',
+  supplierCode: '供应商编码',
+  supplierName: '供应商名称',
+  supplierType: '供应商类别',
+  brandId: '供应品牌',
+  contactPhone: '联系电话',
+  contactName: '联系人',
+  procureStaff: '采购人员',
+  ServiceCategories: '服务类别',
+  supplierAdd: "新建供应商",
+  supplierEdit: "编辑供应商",
+  procurementSupplier: "采购供应商",
+  serviceProvider: "服务供应商",
+  meet: "应付",
+  save: '保存',
 }
 // 供应商
 const goodsSku = {
-  onlyCode:'唯一编码',
-  skuModel:'商品型号',
-  skuName:'商品名称', 
-  subUnitId:'辅助计量单位', 
-  sukSpec:'商品规格',
-  openingInventoryQty:'期初数量',
-  openingInventory:'期初库存',
-  iinventoryBatchNumber:'库存批号',
-  iinitialCostPrice:'期初成本价',
-  purchasePrice:'采购价',
-  retailPrice:'零售价',
-  wholesalePrice:'批发价',
-  SaleSPriceLimit:'销售限价',
-  abbreviation:'品牌简称',
- 
+  onlyCode: '唯一编码',
+  skuModel: '商品型号',
+  skuName: '商品名称',
+  subUnitId: '辅助计量单位',
+  sukSpec: '商品规格',
+  openingInventoryQty: '期初数量',
+  openingInventory: '期初库存',
+  iinventoryBatchNumber: '库存批号',
+  iinitialCostPrice: '期初成本价',
+  purchasePrice: '采购价',
+  retailPrice: '零售价',
+  wholesalePrice: '批发价',
+  SaleSPriceLimit: '销售限价',
+  abbreviation: '品牌简称',
+
 }
-module.exports  = {
-  items:Object.assign({},home,basicData,columns,saleOrder,button,messages,others,accountsManage,org,supplier,goodsSku)
+module.exports = {
+  items: Object.assign({}, home, basicData, columns, saleOrder, button, messages, others, accountsManage, org, supplier, goodsSku)
 }

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

@@ -1,38 +1,44 @@
 const mixins = require('@/mixins/index.js')
 const util = require('@/utils/util.js')
 const Constants = require('@/utils/Constants.js');
-const api = require('@/utils/api.js'); 
+const api = require('@/utils/api.js');
+
+const app = getApp()
+
 Page({
-    mixins: [mixins],
-    /**
-     * 页面的初始数据
-     */
-    data: {
-        // 路由
-        routeObjName: 'setting',
-        cardList: ['main'],
-        contentObj: {
-            main: [
-                { code: 'activateProduct', type: 'tabs', tagList: [
-                    { name: mixins.$t('standardVersion'), id: 'standardVersion' },
-                    { name: mixins.$t('professionalVersion'), id: 'professionalVersion' }
-                ], title: mixins.$t('activateProduct') },
-                { code: 'companyName', type: 'str', readonly: 'true', required: 'true', title: mixins.$t('companyName') },
-                { code: 'headName', type: 'str', readonly: 'true', required: 'true', title: mixins.$t('headName') },
-                { code: 'contactPhone', type: 'str', readonly: 'true', required: 'true', title: mixins.$t('contactPhone') },
-                { code: 'userCount', type: 'str', readonly: 'true', title: mixins.$t('userCount') },
-                { code: 'shopCount', type: 'str', readonly: 'true', title: mixins.$t('shopCount') },
-                { code: 'communicationFeedback', type: 'textarea', readonly: 'true', title: mixins.$t('communicationFeedback') },
-            ],
+  mixins: [mixins],
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    // 路由
+    routeObjName: 'setting',
+    companyService: app.globalData['companyService'],
+    cardList: ['main'],
+    contentObj: {
+      main: [
+        {
+          code: 'gradeCode', type: 'tabs', tagList: [
+            { name: mixins.$t('standardVersion'), id: Constants.gradeCode.STD },
+            { name: mixins.$t('professionalVersion'), id: Constants.gradeCode.PRO }
+          ], title: mixins.$t('gradeCode')
         },
+        { code: 'companyName', type: 'str', required: 'true', title: mixins.$t('companyName') },
+        { code: 'cpManager', type: 'str', required: 'true', title: mixins.$t('cpManager') },
+        { code: 'cpPhone', type: 'phone', required: 'true', title: mixins.$t('cpPhone') },
+        { code: 'cpSize', type: 'str', title: mixins.$t('cpSize') },
+        { code: 'shopSize', type: 'str', title: mixins.$t('shopSize') },
+        { code: 'feedback', type: 'textarea', title: mixins.$t('feedback') },
+      ],
     },
+  },
 
-      /**
-    * @desc : 参数设置
-    * @date : 2024/2/1 15:49
-    * @author : 姜永辉
-    */
-   productDetail(e) { 
+  /**
+* @desc : 参数设置
+* @date : 2024/2/1 15:49
+* @author : 姜永辉
+*/
+  productDetail(e) {
     wx.navigateTo({
       url: this.data.route.productDetail.url,
       events: {
@@ -45,7 +51,31 @@ Page({
         res.eventChannel.emit('params', {})
       }
     })
-},
-    
+  },
+
+  /**
+    * @desc : 保存的參數設置
+    * @date : 2024/2/1 15:49
+    * @author : 姜永辉
+    */
+  setParams(params) {
+    params.cpId = null
+    if (params.gradeCode == null) {
+      params.gradeCode = Constants.gradeCode.STD
+    }
+    return params
+  },
+
+  /**
+  * @desc : 保存数据服务
+  * @date : 2024/2/1 15:49
+  * @author : 姜永辉
+  */
+  saveData() {
+    console.log(this.data.params);
+    return this.excute(this.data.companyService, this.data.companyService.insert, this.data.params);
+
+  },
+
 
 })

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

@@ -40,4 +40,9 @@
   </view>
 </view>
 <view style="height: 200rpx;"></view>
-<dk-save-bottom flagTypeName="select-functional-permissions" bottomClass="{{true}}" bind:submit="toClose" bind:allClean="toAdd" /> 
+<!-- <dk-save-bottom flagTypeName="select-functional-permissions" bottomClass="{{true}}" bind:submit="toClose" bind:allClean="save" />  -->
+
+<view class="bottom-class">
+  <van-button custom-class="save-button-class" disabled="{{loading}}" loading="{{loading}}" bind:click="save" type="default">保存
+  </van-button>
+</view>

pages/company/company.js

@@ -6,19 +6,12 @@ Page({
         companyList: [
             {
                 cpId: 1,
-                companyName: '东科软件',
+                companyName: '东科智云-标准版',
             },
+           
             {
                 cpId: 2,
-                companyName: '东科北京公司',
-            },
-            {
-                cpId: 3,
-                companyName: '东科沈阳公司',
-            },
-            {
-                cpId: 1111111111,
-                companyName: '免费体验',
+                companyName: '东科智云-标准版-体验',
             },
         ],
 

pages/login/login.js

@@ -24,17 +24,17 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-    // this.wx_login()
+    this.wx_login()
   },
 
   /**
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-    // 调转主页
-    wx.reLaunch({
-      url: '../../pages/company/company',
-    })
+    // // 调转主页
+    // wx.reLaunch({
+    //   url: '../../pages/company/company',
+    // })
   },
 
   /**
@@ -98,8 +98,8 @@ Page({
     _this.getTokenPromise().then(res => {
       console.log("gettoken", res);
       if (res.data.code === Constants.SUCESS_CODE) {
-        app.globalData.userInfo = res.data
-        if (res.data.company == null || res.data.company.cpId == null) {
+        app.globalData.user = res.data.data
+        if (res.data.data.company == undefined || res.data.data.company.cpId == undefined || res.data.data.company.cpId == 2) {
           console.log("gettoken", res);
           // 调转选择公司
           wx.reLaunch({

pages/mine/mine.js

@@ -347,9 +347,7 @@ Page({
      */
     if (app.globalData.user) {
       this.setData({
-        userInfo: app.globalData.user,
-        showStoreFlag: storeManagerFlg,
-        active: storeManagerFlg ? 'store' : 'staff'
+        userInfo: app.globalData.user,  
       })
     }
     // this.getAppCount()

utils/Constants.js

@@ -59,6 +59,18 @@ module.exports = {
   },
 
   // 表单类型
+  gradeCode:{
+    // 标准版
+    STD:'STD',
+    // 专业版
+    PRO:'PRO',
+    // 旗舰版
+    PLUS:'PLUS',
+    // 独立会员vip
+    VIPS:'VIPS'
+  },
+
+  // 表单类型
   formMode:{
     // 列表
     index:'index',