Merge branch 'master' of http://git.dongkesoft.com:9001/iBOSS-2.0-Mini/iboss_wx_app

api/pages/mst/saleChannel.js

@@ -10,10 +10,10 @@
 module.exports = {
   saleChannelService: {
     // 前缀
-    prefix: 'mdm-server-dkic-b1/mst/roleFun/'
+    prefix: 'mdm-server-dkic-b1/mst/saleChannel/'
   },
   routeUrl: {
-    warehouse: {
+    saleChannel: {
     
     }
   }

api/pages/mst/warehouse.js

@@ -10,7 +10,7 @@
 module.exports = {
   warehouseService: {
     // 前缀
-    prefix: 'mdm-server-dkic-b1/mst/roleFun/'
+    prefix: 'mdm-server-dkic-b1/mst/warehouse/'
   },
   routeUrl: {
     warehouse: {

api/pages/other/setting.js

@@ -10,17 +10,17 @@
 module.exports = {
     settingService: {
         // 前缀
-        prefix: 'mdm-server-dkic-b1/common/setting/', 
-        
+        prefix: 'mdm-server-dkic-b1/common/setting/',
+
     },
 
     routeUrl: {
         setting: {
-          // 用name代替url,为了传递params,params和url不能一起使用
-          companySetting: {key: 'companySetting', url: '/package-basic-data/pages/register/company-setting/company-setting'}, 
-           companyRegister: {key: 'companyRegister', url: '/package-basic-data/pages/register/company-register/company-register'},
-           companyParamSetting: {key: 'companyRegister', url: '/package-basic-data/pages/register/company-param-setting/company-param-setting'},
-          
+            // 用name代替url,为了传递params,params和url不能一起使用
+            companySetting: { key: 'companySetting', url: '/package-basic-data/pages/register/company-setting/company-setting' },
+            companyRegister: { key: 'companyRegister', url: '/package-basic-data/pages/register/company-register/company-register' },
+            companyParamSetting: { key: 'companyRegister', url: '/package-basic-data/pages/register/company-param-setting/company-param-setting' },
+            productDetail: { key: 'productDetail', url: '/package-basic-data/pages/register/product-detail/product-detail' },
         }
     }
 };

app.json

@@ -14,6 +14,7 @@
             "pages": [
                 "pages/test/test",
                 "pages/register/company-register/company-register",
+                "pages/register/product-detail/product-detail",
                 "pages/register/product-standard-detail/product-standard-detail",
                 "pages/register/product-professional-detail/product-professional-detail",
                 "pages/register/company-setting/company-setting",

components/dkbase/dk-list/dk-list.js

@@ -117,7 +117,15 @@ Component({
     },
     subMainTitlelabel:{ //主标题右侧文本 label
       type: String 
-    }
+    },
+
+    defaultFlagKey:{ //默认key
+      type: String 
+    },
+    defaultFlag:{ //开启默认
+      type: Boolean,
+      value: false 
+    },
   },
 
   /**

components/dkbase/dk-list/dk-list.wxml

@@ -24,14 +24,20 @@
             <view style="width: auto;" wx:if="{{subMainTitle}}">
               <dk-text  data-item="{{item}}" textDecoration="underline" fontSize="15px" value="{{subMainTitlelabel + item[subMainTitle]}}"></dk-text>
             </view>
+            <view wx:if="{{defaultFlag &&  item[defaultFlagKey]}}">
+              <view class="status-detail-class-flg-default" >{{'默认'}}
+              </view>
+            </view>
+
+
             <!-- 状态 -->
             <view wx:if="{{statusFlag}}" class="status-class" data-item="{{item}}" catchtap="toStatus">
               <view class="status-detail-class" style="{{item.backgroundColor?'background-color:' + item.backgroundColor:null }}">{{item[status]}}
               </view>
             </view>
             <!-- 启用/停用标识-->
-            <view wx:if="{{switchFlag}}" >
-              <view class="status-detail-class" style="{{item['flgValid'] ? 'width: 100%;' : 'background-color:red;width: 100%;'}}">{{item['flgValid'] ? $t['enable'] : $t['disable']}}
+            <view wx:if="{{switchFlag}}" style="text-align: right;" >
+              <view class="status-detail-class" style="{{item['flgValid'] ? 'width: 56rpx' : 'background-color:red;width: 56rpx;'}}">{{item['flgValid'] ? $t['enable'] : $t['disable']}}
               </view>
             </view>
             <!-- 三个小点 -->

components/dkbase/dk-list/dk-list.wxss

@@ -81,7 +81,17 @@
   color: #fff;
   padding: 0 20rpx;
 }
-
+.status-detail-class-flg-default {
+  height: 49rpx;
+  line-height: 49rpx;
+  border-radius: 6rpx;
+  background-color: #CAA977;
+  text-align: center;
+  width: 56rpx;
+  font-size: 13px;
+  color: #fff;
+  padding: 0 20rpx;
+}
 .status-font-class {
   font-size: 13px;
   color: #FFFFFF;

components/dkbase/dk-popup/dk-popup.js

@@ -183,6 +183,8 @@ Component({
         })
       }else if (item.item.type == 'choose') {
         // 跳转链接
+        console.log('this.data.routeUrl',this.data.routeUrl)
+        console.log('this.data.routeObjName',this.data.routeObjName)
         if (item.item.urlKey) {
           let url = this.data.routeUrl[this.data.routeObjName][item.item.urlKey].url
           // TODO

i18n/zh-CN.js

@@ -74,6 +74,22 @@ const basicData = {
   decimalPlacesNumber:'小数：',
   catCode:'种类编码',
   catName:'种类名称',
+  catName:'种类名称',
+  //基础资料
+  warehouse:'仓库档案',
+  saleChannel:'销售渠道',
+  incomeCategory:'收入类别',
+  expenditureCategory:'支出类别',
+  reasonStorage:'入库原因',
+  reasonOutbound:'出库原因',
+  accountCategory:'账户类别',
+  customerSource:'客户来源',
+  customerlabel:'客户标签',
+  whCode:'仓库编码',
+  whName:'仓库名称',
+  supervisor:'仓库主管',
+  channelCode:'渠道编码',
+  channelName:'渠道名称',
 }
 
 

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

@@ -6,534 +6,274 @@
  *		作者				日期					版本				修改内容
  *		于继渤		 2024-1-23			1.00		    基础资料
  *******************************************************************************/
+const Constants = require('@/utils/Constants.js');
+const util = require('@/utils/util.js')
+const mixins = require('@/mixins/index.js')
+const app = getApp()
 Page({
-
+  mixins: [mixins],
   /**
    * 页面的初始数据
    */
   data: {
-    sideKey: 0,
-    listTitle: '',
-    showPopup: false,
-    leftData: [],
-    showPopupItem: {},
-    fieldData: {},
-    statusItem: {
-      text: '全部',
-      value: -1
-    },
-    statusList: [
-      { checked: false, text: '有效', value: 1},
-      { checked: false, text: '无效', value: 0 },
-      { checked: true, text: '全部', value: -1 },
-    ], //状态
-    fieldList: [
-      {
-        typeName: '仓库档案',
-        warehouseCode: '仓库编码',
-        warehouseName: '仓库名称',
-        supervisorName: '仓库主管'
-      },
-      {
-        typeName: '销售渠道',
-        channelCode: '渠道编码',
-        channelName: '渠道名称'
-      },
-      {
-        typeName: '收入类别',
-        incomeCode: '收入编码',
-        incomeName: '收入名称'
-      },
-      {
-        typeName: '支出类别',
-        expenditureCode: '支出编码',
-        expenditureName: '支出名称'
-      },
-      {
-        typeName: '入库原因',
-        reasonCode: '原因编码',
-        reasonName: '原因名称'
-      },
-      {
-        typeName: '出库原因',
-        reasonCode: '原因编码',
-        reasonName: '原因名称'
-      },
-      {
-        typeName: '账户类别',
-        paymentCode: '账户编码',
-        paymentName: '账户名称'
-      },
-      {
-        typeName: '客户来源',
-        sourceCode: '来源编码',
-        sourceName: '来源名称'
-      },
-      {
-        typeName: '客户标签'
-      },
-      
-    ], //字段渲染
-    // 渲染数据
-    test00: [{
-      warehouseCode: 'CK00001',
-      warehouseName: '运营主仓',
-      supervisorName: '王仓管员/15640556650',
-      flagValue: true,
-      defFlag: true
-    },
-    {
-      warehouseCode: 'CK00002',
-      warehouseName: '红星店面仓库',
-      supervisorName: '王店长/15640556650',
-      flagValue: false
-    },
-    {
-      warehouseCode: 'CK00003',
-      warehouseName: '红星店面仓库',
-      supervisorName: '王店长/15640556650',
-      flagValue: true
-    }],
-    test01: [
-      {
-        channelCode: 'QD00001',
-        channelName: '零售',
-        flagValue: true,
-        defFlag: true
-      },
-      {
-        channelCode: 'QD00002',
-        channelName: '家装',
-        flagValue: true
-      },
-      {
-        channelCode: 'QD00003',
-        channelName: '分销',
-        flagValue: true
-      },
-      {
-        channelCode: 'QD00004',
-        channelName: '工程',
-        flagValue: true
-      },
-      {
-        channelCode: 'QD00005',
-        channelName: '其他',
-        flagValue: true
-      }
-    ],
-    test02: [
-      {
-        incomeCode: 'SR00001',
-        incomeName: '配送费',
-        flagValue: true,
-        defFlag: true
-      },
-      {
-        incomeCode: 'SR00002',
-        incomeName: '安装费',
-        flagValue: true
-      },
-      {
-        incomeCode: 'SR00003',
-        incomeName: '加工费',
-        flagValue: true
-      },
-      {
-        incomeCode: 'SR00004',
-        incomeName: '拆旧费',
-        flagValue: true
-      },
-      {
-        incomeCode: 'SR00005',
-        incomeName: '其他收入',
-        flagValue: true
-      }
-    ],
-    test03: [
-      {
-        expenditureCode: 'SR00001',
-        expenditureName: '房租费',
-        flagValue: true,
-        defFlag: true
-      },
-      {
-        expenditureCode: 'SR00002',
-        expenditureName: '水电费',
-        flagValue: true
-      },
-      {
-        expenditureCode: 'SR00003',
-        expenditureName: '送货费',
-        flagValue: true
-      },
-      {
-        expenditureCode: 'SR00004',
-        expenditureName: '员工工资',
-        flagValue: true
-      },
-      {
-        expenditureCode: 'SR00005',
-        expenditureName: '促销活动费',
-        flagValue: true
-      }
-    ],
-    test04: [
-      {
-        reasonCode: 'RK00001',
-        reasonName: '期初入库',
-        flagValue: true,
-        defFlag: true
-      },
-      {
-        reasonCode: 'RK00002',
-        reasonName: '其他入库',
-        flagValue: true
-      },
-      {
-        reasonCode: 'RK00003',
-        reasonName: '采购入库',
-        flagValue: true
-      },
-      {
-        reasonCode: 'RK00004',
-        reasonName: '销售回库',
-        flagValue: true
-      }
-    ],
-    test05: [
-      {
-        reasonCode: 'CK00001',
-        reasonName: '销售出库',
-        flagValue: true,
-        defFlag: true
-      },
+    routeObjNameGoTo: '',
+    formDataName: mixins.$t('warehouse'),
+    //接口
+    warehouseService: app.globalData['warehouseService'],
+    saleChannelService: app.globalData['saleChannelService'],
+    routeObjName: 'basic-data',
+    tableData:[],
+    sidebarList: [
       {
-        reasonCode: 'CK00002',
-        reasonName: '其他出库',
-        flagValue: true
+        id: 0,
+        name: mixins.$t('warehouse')
       },
       {
-        reasonCode: 'CK00003',
-        reasonName: '采购退货出库',
-        flagValue: true
+        id: 1,
+        name: mixins.$t('saleChannel')
       },
       {
-        reasonCode: 'CK00004',
-        reasonName: '调货出库',
-        flagValue: true
-      }
-    ],
-    test06: [
-      {
-        paymentCode: 'SF00001',
-        paymentName: '微信',
-        flagValue: true,
-        defFlag: true
+        id: 2,
+        name: mixins.$t('incomeCategory')
       },
       {
-        paymentCode: 'SF00002',
-        paymentName: '现金',
-        flagValue: true
+        id: 3,
+        name: mixins.$t('expenditureCategory')
       },
       {
-        paymentCode: 'SF00003',
-        paymentName: '银行转账',
-        flagValue: true
+        id: 4,
+        name: mixins.$t('reasonStorage')
       },
       {
-        paymentCode: 'SF00004',
-        paymentName: '支付宝',
-        flagValue: true
-      }
-    ],
-    test07: [
-      {
-        sourceCode: 'QD00001',
-        sourceName: '零售',
-        flagValue: true,
-        defFlag: true
+        id: 5,
+        name: mixins.$t('reasonOutbound')
       },
       {
-        sourceCode: 'QD00002',
-        sourceName: '家装',
-        flagValue: true
+        id: 6,
+        name: mixins.$t('accountCategory')
       },
       {
-        sourceCode: 'QD00003',
-        sourceName: '分销',
-        flagValue: true
-      },
-      {
-        sourceCode: 'QD00004',
-        sourceName: '工程',
-        flagValue: true
-      }
-    ],
-
-    test08: [
-      {
-        code: '客户级别',
-        list:[
-          {
-            code:'A类',
-            flagValue:true,
-          },
-          {
-            code:'B类',
-            flagValue:true,
-          }
-   
-        ],
+        id: 7,
+        name: mixins.$t('customerSource')
       },
       {
-        code: '房屋类型',
-        list:[
-          {
-            code:'两居室',
-            flagValue:true,
-          },
-          {
-            code:'三居室',
-            flagValue:true,
-          }
-        ],
+        id: 8,
+        name: mixins.$t('customerlabel')
       },
 
-      {
-        code: '装修风格',
-        list:[
-          {
-            code:'中式',
-            flagValue:true,
-          },
-          {
-            code:'欧式',
-            flagValue:true,
-          },
-         
-        ],
-      },
     ],
+    contentList: [
+      { name: 'whCode', title: mixins.$t('whCode') },
+      { name: 'whName', title: mixins.$t('whName') },
+      { name: 'supervisor', title: mixins.$t('supervisor') }
+    ],
+    popContent:
+      [
+        { code: 'whCode', type: 'str', title: mixins.$t('whCode'), required: false, readonly: true, },
+        { code: 'whName', type: 'str', title: mixins.$t('whName'), required: true },
+        { code: 'supervisor', type: 'str', title: mixins.$t('supervisor'), required: true },
+        { code: 'contactPhone', type: 'str', title: mixins.$t('contactPhone'), required: true },
+        { code: 'remarks', type: 'str', title: mixins.$t('remarks'), required: false }
+      ],
+    sideKey: 0,
   },
 
-  dropdownSwitchCommit(e) {
-    console.log(e)
-  },
-
-
-
   /**
-   * @desc : 分类切换
+   * @desc : 设置pop字段
    * @author : 于继渤
-   * @date : 2022/5/26 20:16
+   * @date : 2024/1/23 9:16
    */
-  changeSidebar(e) {
-    console.log(e)
-    let id = this.data.leftData[e.detail].id
-    let name = this.data.leftData[e.detail].name
-    console.log(name)
-    let fieldList = this.data.fieldList
-    let tableData = this.data.tableData
-    let sidebarList = fieldList.filter(res => {
-      return res.typeName == name
-    })
-    if (name == '仓库档案') {
-      tableData = this.data.test00
+  setPopContent() {
+    let formDataName = this.data.formDataName
+    let popContent = this.data.popContent
+    let contentList = this.data.contentList
+    let routeObjNameGoTo = this.data.routeObjNameGoTo
+    if (formDataName == mixins.$t('warehouse')) {//仓库档案
+      //设置列表字段
+      contentList = [
+        { name: 'whCode', title: mixins.$t('whCode') },
+        { name: 'whName', title: mixins.$t('whName') },
+        { name: 'supervisor', title: mixins.$t('supervisor') }
+      ]
+      //设置新建编辑字段
+      popContent =
+        [
+          { code: 'whCode', type: 'str', title: mixins.$t('whCode'), required: false, readonly: true, },
+          { code: 'whName', type: 'str', title: mixins.$t('whName'), required: true },
+          { code: 'supervisor', type: 'str', title: mixins.$t('supervisor'), required: true },
+          { code: 'contactPhone', type: 'str', title: mixins.$t('contactPhone'), required: true },
+          { code: 'remarks', type: 'str', title: mixins.$t('remarks'), required: false }
+        ]
+      routeObjNameGoTo = 'warehouse'
     }
-    if (name == '销售渠道') {
-      tableData = this.data.test01
+    if (formDataName == mixins.$t('saleChannel')) {
+      //设置列表字段
+      contentList = [
+        { name: 'channelCode', title: mixins.$t('channelCode') },
+        { name: 'channelName', title: mixins.$t('channelName') }
+      ]
+      popContent =
+        [
+          { code: 'channelCode', type: 'str', title: mixins.$t('channelCode'), required: false, readonly: true, },
+          { code: 'channelName', type: 'str', title: mixins.$t('channelName'), required: true },
+          { code: 'remarks', type: 'str', title: mixins.$t('remarks'), required: false }
+        ]
     }
-    if (name == '收入类别') {
-      tableData = this.data.test02
-    }
-    if (name == '支出类别') {
-      tableData = this.data.test03
-    }
-    if (name == '入库原因') {
-      tableData = this.data.test04
-    }
-    if (name == '出库原因') {
-      tableData = this.data.test05
-    }
-    if (name == '账户类别') {
-      tableData = this.data.test06
-    }
-    if (name == '客户来源') {
-      tableData = this.data.test07
-    }
-    if (name == '客户标签') {
-      tableData = this.data.test08
-    }
-    
-    this.setData({
-      sideKey: e.detail,
-      specsId: e.detail.id,
-      fieldData: sidebarList[0],
-      tableData: tableData
-    })
+
     this.setData({
-      searchText: ''
+      contentList: contentList,
+      popContent: popContent,
+      routeObjNameGoTo: routeObjNameGoTo
     })
-    // 查询
-    // this.doSearch()
+  },
+
+  /**
+   * @desc :   启用停用
+   * @date : 2024/2/1 15:49
+   * @author : 于继渤
+   */
+  deactivateEnable(e) {
+    let item = e.detail.item
+    let service = null
+    let id = null
+    if (this.data.formDataName == mixins.$t('warehouse')) {
+      service = this.data.warehouseService
+      id = 'whId'
+    }
+    if (this.data.formDataName == mixins.$t('saleChannel')) {
+      service = this.data.saleChannelService
+      id = 'channelId'
+    }
+
+    //执行接口
+    this.handleMoreDataIsValid(service, item, id)
   },
   /**
-   * @desc : 左滑功能
+   * @desc : 分类切换
    * @author : 于继渤
-   * @date : 2024/1/23 9:16
+   * @date : 2022/5/26 20:16
    */
-  onCloseDel(e) {
-    console.log(e)
+  changeSidebar(e) {
+  
+    let detail = e.detail
+    this.setData({
+      formDataName: this.data.sidebarList[detail].name
+    })
+    this.setPopContent();
+    this.searchData()
   },
-
   /**
    * @desc : 列表对象点击
    * @author : 于继渤
    * @date : 2024/1/23 9:16
    */
   toDetail(e) {
-    console.log(e)
-    let index = e.currentTarget.dataset.index
-    let tableData = this.data.tableData
+    this.setPopContent();
+    let item = e.detail.item
     this.setData({
-      showPopup: true,
-      showPopupItem: tableData[index]
+      popContent: this.data.popContent,
+      showPop: true,
+      dataItem: JSON.stringify(item)
     })
   },
   /**
- * @desc : 关闭弹窗
+ * @desc : 新建
  * @author : 于继渤
  * @date : 2024/1/23 9:16
  */
-  onClosePopup() {
-    this.setData({
-      showPopup: false
-    })
-  },
-  /**
-   * @desc : 新建
-   * @author : 于继渤
-   * @date : 2024/1/23 9:16
-   */
   toAdd() {
+    this.setPopContent();
     this.setData({
-      showPopupItem: {},
-      showPopup: true
+      dataItem: null,
+      formData: null,
+      showPop: true,
     })
+
   },
+  /**
+     * @desc : 加载数据
+     * @author : 于继渤
+     * @date : 2024/1/23 9:16
+     */
+  getData(params) {
+    if (this.data.formDataName == mixins.$t('warehouse')) { //仓库档案
+      return this.excute(this.data.warehouseService, this.data.warehouseService.selectByCond, params);
+    } else if (this.data.formDataName == mixins.$t('saleChannel')) { //销售渠道
+      return this.excute(this.data.saleChannelService, this.data.saleChannelService.selectByCond, params);
+    }
 
+  },
   /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad(options) {
-    let _this = this;
-    wx.getSystemInfo({
-      success: function (res) {
-        _this.setData({
-          windowHeight: res.windowHeight,
-          windowWidth: res.windowWidth
-        })
-      }
+    * @desc :   处理接口返回数据
+    * @date : 2024/2/1 15:49
+    * @author : 于继渤
+    */
+  handleSearchData(tableData) {
+  
+    tableData.forEach(res => {
+      res.listItemTitle = this.data.formDataName
     })
-
-
-
-    let leftData = [
-      {
-        id: 1,
-        name: '仓库档案'
-      },
-      {
-        id: 1,
-        name: '销售渠道'
-      },
-      {
-        id: 1,
-        name: '收入类别'
-      },
-      {
-        id: 1,
-        name: '支出类别'
-      },
-      {
-        id: 1,
-        name: '入库原因'
-      },
-      {
-        id: 1,
-        name: '出库原因'
-      },
-      {
-        id: 1,
-        name: '账户类别'
-      },
-      {
-        id: 1,
-        name: '客户来源'
-      },
-      {
-        id: 1,
-        name: '客户标签'
-      },
-      
-    ]
-    let tableData = this.data.test00
     this.setData({
-      leftData: leftData,
-      tableData: tableData,
-      listTitle: leftData[0].name,
-      fieldData: this.data.fieldList[0]
-
+      tableData: tableData
     })
-  },
-
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady() {
 
   },
 
   /**
-   * 生命周期函数--监听页面显示
+   * @desc   : 新建编辑事件
+   * @author : 于继渤
+   * @date   : 2024/1/26 11:46
    */
-  onShow() {
-
+  editItems(e) {
+    let data = e.detail.form
+    this.setData({
+      formData: JSON.stringify(data)
+    })
+    //执行保存编辑操作
+    this.save({})
   },
 
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide() {
-
-  },
 
   /**
-   * 生命周期函数--监听页面卸载
+   * @desc : 保存编辑
+   * @author : 于继渤
+   * @date : 2022/5/26 20:16
    */
-  onUnload() {
+  saveData(params) {
+    let id = null
+    let service = null
+    if (this.data.formDataName == mixins.$t('warehouse')) { //仓库档案
+      service = this.data.warehouseService
+      id = params.whId
+    }
+    if (this.data.formDataName == mixins.$t('saleChannel')) { //销售渠道
+      service = this.data.saleChannelService
+      id = params.channelId
+    }
+    if (id) { //编辑
+      return this.excute(service, service.update, params);
+    } else { //新建
+      return this.excute(service, service.insert, params);
+    }
 
   },
 
   /**
-   * 页面相关事件处理函数--监听用户下拉动作
+   * 生命周期函数--监听页面加载
    */
-  onPullDownRefresh() {
-
-  },
+  onLoad(options) {
+    let _this = this;
+    wx.getSystemInfo({
+      success: function (res) {
+        _this.setData({
+          windowHeight: res.windowHeight,
+          windowWidth: res.windowWidth
+        })
+      }
+    })
 
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom() {
 
   },
 
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage() {
 
-  }
 })

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

@@ -13,184 +13,26 @@
   <!-- 左侧菜单列表 -->
   <van-sidebar activeKey="{{sideKey}}" bindchange="changeSidebar" custom-class="left-class">
     <view style="height:calc({{windowHeight+'px'}} - {{'390rpx'}});overflow: scroll;">
-      <van-sidebar-item wx:key="index" custom-class="{{sideKey - 1 == index? 'sidebar-item-before': (sideKey + 1 == index?'sidebar-item-next':'sidebar-item')}}" title="{{item.name}}" data-id="{{item.id}}" wx:for="{{leftData}}" />
+      <van-sidebar-item wx:key="index" custom-class="{{sideKey - 1 == index? 'sidebar-item-before': (sideKey + 1 == index?'sidebar-item-next':'sidebar-item')}}" title="{{item.name}}" data-id="{{item.id}}" wx:for="{{sidebarList}}" />
     </view>
   </van-sidebar>
-  <!-- 内容列表 -->
   <view style="margin-left: 140rpx;width: 100%;">
-    <view wx:for="{{tableData}}" wx:key="index" class="main-class">
-      <van-swipe-cell right-width="{{ 65 }}">
-        <view bind:tap="toDetail" data-index="{{index}}" class="main-foot" style="border-radius:15rpx;">
-          <view class="table-content">
-            <view wx:if="{{fieldData.typeName != '客户标签'}}" class="table-content-row">
-              <view style="display: flex;">
-                <view style="font-size: 15px;font-weight: 600;width: 80%;">
-                  {{fieldData.typeName}}
-                </view>
-                <view wx:if="{{item.defFlag}}" style="height: 49rpx;border-radius: 6rpx;background-color:#CAA977;text-align: center;width: 20%;margin-right: 10rpx;">
-                  <text style=" font-size: 13px;color:  #FFFFFF;">{{'默认'}}</text>
-                </view>
-                <view style="height: 49rpx;border-radius: 6rpx;background-color: {{ item.flagValue ?'#77C5D5':'rgba(228, 0, 43, 1)'}};text-align: center;width: 20%;">
-                  <text style=" font-size: 13px;color:  #FFFFFF;">{{item.flagValue ? '启用' : '停用'}}</text>
-                </view>
-              </view>
+  <!-- 列表 -->
+    <dk-list list="{{tableData}}" titleImageFlag="{{false}}" swipeDisabled="{{false}}" bind:swipe="deactivateEnable" statusFlag="{{false}}" flgPoint="{{false}}" switchFlag="{{true}}" title="listItemTitle" content="{{contentList}}" collectName="" contentObj="{{contentObj}}" bind:toDetail="toDetail" bind:toPoint="toPoint" routeObjName="{{routeObjName}}" buttonList="{{buttonList}}" 
+    defaultFlag="{{true}}" defaultFlagKey="flgDefault"
+    bind:open="open"></dk-list>
 
-            </view>
-            <view wx:if="{{fieldData.typeName != '客户标签'}}" wx:for="{{fieldData}}" wx:for-index="key" wx:for-item="value">
-              <view class="table-row" wx:if="{{'typeName' != key}}">
-                <view class="table-content-row">
-                  <view style="display: flex;">
-                    <view class="table-content-row-font">
-                      <dk-text fontSize="14px" color="#95A8CB" fontWeight="nomal" value="{{value}}" copyValue="{{item[key]}}"></dk-text>
-                    </view>
-                    <view class="table-content-class">
-                      {{item[key]?item[key]:''}}
-                    </view>
-                  </view>
-                </view>
-              </view>
-            </view>
-
-            <view class="table-content-row" wx:if="{{fieldData.typeName == '客户标签'}}">
-              <view style="display: flex;">
-                <view style="font-size: 15px;font-weight: 600;width: 80%;">
-                  {{item.code}}
-                </view>
-                <view style="width: 20%;text-align: right;" bind:tap="openArrow" data-index="{{index}}">
-                  <van-icon name="{{'arrow-down'}}" color="#1B365D" />
-                </view>
-              </view>
-
-            </view>
-            <view wx:if="{{fieldData.typeName == '客户标签'}}">
-              <view class="table-content">
-
-                <view style="width: 80%;flex-direction: row;margin-top: 0px;" wx:if="{{item.list}}">
-                  <view wx:for="{{item.list}}" wx:for-index="arrow_1_index" wx:for-item="arrow_1_item" class="table-content-row" style="width:100%;margin-left: 20rpx;">
-                    <view style="display: flex;">
-                      <view style="width: 10%;" bind:tap="openArrow" data-index="{{index}}">
-                        <van-icon name="{{arrow_1_item.arrow_2 ? 'arrow-down':'arrow'}}" color="#1B365D" />
-                      </view>
-                      <view style="font-size: 14px;font-weight: 600;width: 80%;" bind:tap="openArrow" data-index="{{arrow_1_index}}">
-                        {{arrow_1_item.code}}
-                      </view>
-                      <view style="height: 49rpx;border-radius: 6rpx;background-color: {{ arrow_1_item.flagValue ?'#77C5D5':'rgba(228, 0, 43, 1)'}};text-align: center;width: 20%;">
-                        <text style=" font-size: 13px;color:  #FFFFFF;">{{arrow_1_item.flagValue ? '启用' : '停用'}}</text>
-                      </view>
-                    </view>
-
-                    <view class="table-row" style="width: 100%;" wx:if="{{arrow_1_item.arrow_2}}">
-                      <view wx:for="{{arrow_1_item.arrow_2_list}}" wx:for-index="arrow_2_index" wx:for-item="arrow_2_item" class="table-content-row" style="width:100%;padding-left:10px;padding-right: 2rpx;">
-                        <view style="display: flex;">
-                          <view style="width: 10%;" bind:tap="openArrow" data-index="{{index}}">
-                            <van-icon name="{{arrow_2_item.arrow_2 ? 'arrow-down':'arrow'}}" color="#1B365D" />
-                          </view>
-                          <view style="font-size: 14px;font-weight: 600;width: 80%;" bind:tap="openArrow" data-index="{{arrow_2_index}}">
-                            {{arrow_2_item.name}}
-                          </view>
-                          <view style="height: 49rpx;border-radius: 6rpx;background-color: {{ arrow_2_item.flagValue ?'#77C5D5':'rgba(228, 0, 43, 1)'}};text-align: center;width: 20%;">
-                            <text style=" font-size: 13px;color:  #FFFFFF;">{{arrow_2_item.flagValue ? '启用' : '停用'}}</text>
-                          </view>
-                        </view>
-                      </view>
-                    </view>
-                  </view>
-                </view>
-
-
-
-              </view>
-            </view>
-
-
-
-          </view>
-        </view>
-        <view data-index="{{index}}" bind:tap="onCloseDel" slot="right">{{item.flagValue ? '停用' : '启用'}}</view>
-      </van-swipe-cell>
-
-    </view>
+    
     <!-- 保留高度 -->
     <view style="height: 220rpx;"></view>
   </view>
-</view>
-
-
-<!-- 弹窗 编辑/新建-->
-<van-popup show="{{showPopup}}" position="bottom" bind:close="onClosePopup" custom-class="function-pop-class">
-
-  <view style="background-color:#F8F9FD;color:#1B365D;font-size: 17px;font-weight: 600;display: flex;justify-content: left;align-items: center;padding: 40rpx;">
-    <view style="width: 70%;">{{fieldData.typeName}}</view>
-
-    <view wx:if="{{fieldData.typeName !== '客户标签'}}" style="display: flex;justify-content: center;align-items: center;width: 30%;">
-      <van-checkbox size="13" value="{{true}}" data-index="{{index}}" checked-color="#1989FA" />
-      <view style="margin-left: 20rpx;font-size: 13px;">默认</view>
-    </view>
-  </view>
-
-
-
-
-  <view wx:for="{{fieldData}}" wx:for-index="key" wx:for-item="value" wx:if="{{'typeName' != key}}">
-
-    <van-field wx:if="{{key == 'warehouseCode' || key == 'channelCode' || key =='incomeCode' || key =='expenditureCode' || key =='reasonCode'|| key =='paymentCode' }}" disabled="{{true}}" input-width="200rpx" input-class="dk-cell-value-class" input-align="left" label-class="nomal-label" maxlength="50" value="{{ showPopupItem[key] }}" input-align="right" label="{{ value}}" placeholder="{{'请输入' + value}}" autosize border="{{ false }}">
-    </van-field>
-    <van-field wx:if="{{key !== 'warehouseCode' &&  key !== 'channelCode' &&  key !=='incomeCode' && key !=='expenditureCode' &&  key !=='reasonCode' && key !=='paymentCode' }}" disabled="{{false}}" input-width="200rpx" input-class="dk-cell-value-class" input-align="left" label-class="{{(key == 'warehouseName' || key == 'channelName' || key =='incomeName' &&  key =='expenditureName' || key =='reasonName'|| key =='paymentName' ) ? 'red-label':'' }}" maxlength="50" value="{{ showPopupItem[key] }}" input-align="right" label="{{ value}}" placeholder="{{'请输入' + value}}" autosize border="{{ false }}">
-    </van-field>
-
-
-
-  </view>
-
-
-
-
-  <view wx:if="{{fieldData.typeName == '客户标签'}}">
-
-    <van-field disabled="{{false}}" input-width="200rpx" input-class="dk-cell-value-class" input-align="left" label-class="nomal-label" disabled="{{true}}" maxlength="50" value="ZL00001" input-align="right" label="标签编码" placeholder="{{'请输入' + '标签编码'}}" autosize border="{{ false }}">
-    </van-field>
-    <van-field disabled="{{false}}" input-width="200rpx" input-class="dk-cell-value-class" input-align="left" label-class="nomal-label" disabled="{{true}}" maxlength="50" value="年龄构成" input-align="right" label="标签分类" placeholder="{{'请输入' + '标签分类'}}" autosize border="{{ false }}">
-    </van-field>
-    <van-field disabled="{{false}}" input-width="200rpx" input-class="dk-cell-value-class" input-align="left" label-class="red-label" disabled="{{true}}" maxlength="50" value="90后" input-align="right" label="标签名称" placeholder="{{'请输入' + '标签名称'}}" autosize border="{{ false }}">
-    </van-field>
-
-  </view>
 
-  <van-field disabled="{{false}}" input-width="200rpx" input-class="dk-cell-value-class" input-align="left" label-class="nomal-label" maxlength="50" value="" input-align="right" label="备注" placeholder="{{'请输入' + '备注'}}" autosize border="{{ false }}">
-  </van-field>
-
-
-
-  <!-- <van-field input-width="200rpx" input-class="dk-cell-value-class" input-align="left" label-class="red-label" data-key="addressNo" maxlength="50" value="{{ showPopupItem.name }}" input-align="right" label="仓库名称" placeholder="请输入仓库名称" autosize border="{{ false }}" bind:change="changeCustomerFormField">
-  </van-field>
-
-  <van-field input-width="200rpx" input-class="dk-cell-value-class" input-align="left" label-class="nomal-label" data-key="addressNo" maxlength="50" value="{{ showPopupItem.value }}" input-align="right" label="仓库主管" placeholder="请输入仓库主管" autosize border="{{ false }}" bind:change="changeCustomerFormField">
-  </van-field>
-
-  <van-field input-width="200rpx" input-class="dk-cell-value-class" input-align="left" label-class="nomal-label" data-key="addressNo" maxlength="50" value="{{ showPopupItem.value }}" input-align="right" label="主管电话" placeholder="请输入主管电话" autosize border="{{ false }}" bind:change="changeCustomerFormField">
-  </van-field>
-
-  <van-field input-width="200rpx" input-class="dk-cell-value-class" input-align="left" label-class="nomal-label" data-key="addressNo" maxlength="50" value="{{ showPopupItem.remark }}" input-align="right" label="备注" placeholder="请输入备注" autosize border="{{ false }}" bind:change="changeCustomerFormField">
-  </van-field> -->
-
-  <!-- 保留 -->
-  <!-- <van-field input-width="200rpx" input-class="dk-cell-value-class" input-align="left" label-class="nomal-label" data-key="addressNo" maxlength="50" value="{{ form.customerForm.addressNo }}" input-align="right" label="仓库名称" placeholder="请输入仓库名称" autosize border="{{ false }}" bind:change="changeCustomerFormField">
-  </van-field> -->
+</view>
 
 
+<dk-popup defaultFlagCol="flgDefault" defaultFlagTitle="默认" type="basic" priceTitle="" priceCol="pricePromotion" subCol="desc" title="{{formDataName}}" value="{{dataItem}}" show="{{showPop}}" routeObjName="{{routeObjNameGoTo}}" contentObj="{{popContent}}" bind:commit="editItems">
+</dk-popup>
 
-  <view style="display: flex; padding:35rpx 34rpx 62rpx 34rpx;">
-    <view style="width:48%">
-      <van-button size="large" plain round color="#1B365D" custom-style="height:88rpx;" bind:click="onClosePopup" type="default">取消
-      </van-button>
-    </view>
-    <view style="width: 4%;"></view>
-    <view style="width:48%;">
-      <van-button size="large" round color="#1B365D" custom-style="height:88rpx;" bind:click="allClean" type="default">保存
-      </van-button>
-    </view>
-  </view>
-</van-popup>
 
 <!-- 底部信息 -->
 <dk-save-bottom flagTypeName="basic-data" bottomClass="{{true}}" bind:submit="toClose" bind:allClean="toAdd" />

package-basic-data/pages/product-attribute/product-attribute.js

@@ -187,16 +187,7 @@ Page({
       dataItem: JSON.stringify(item)
     })
   },
-  /**
- * @desc : 关闭弹窗
- * @author : 于继渤
- * @date : 2024/1/23 9:16
- */
-  onClosePopup() {
-    this.setData({
-      showPopup: false
-    })
-  },
+
   /**
    * @desc : 新建
    * @author : 于继渤

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

@@ -27,7 +27,25 @@ Page({
         },
     },
 
-    
+      /**
+    * @desc : 参数设置
+    * @date : 2024/2/1 15:49
+    * @author : 姜永辉
+    */
+   productDetail(e) { 
+    wx.navigateTo({
+      url: this.data.route.productDetail.url,
+      events: {
+        // 回调后，在这里给页面赋值
+        bandData: function (e) {
+        }
+      },
+      success: function (res) {
+        // 通过eventChannel向被打开页面传送数据 TODO 测试例子url是写死的，实际中，需要从route中读取
+        res.eventChannel.emit('params', {})
+      }
+    })
+},
     
 
 })

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

@@ -5,7 +5,8 @@
 <view class="task-progress">
   <view class="task-progress-header">
     <view class="task-progress-header-name">注册商户</view>
-
+    <van-button size='mini' bind:click="productDetail" type="default">产品详情
+      </van-button>
   </view>
 </view>
 
@@ -39,6 +40,4 @@
   </view>
 </view>
 <view style="height: 200rpx;"></view>
-
-
 <dk-save-bottom flagTypeName="select-functional-permissions" bottomClass="{{true}}" bind:submit="toClose" bind:allClean="toAdd" /> 

package-basic-data/pages/register/product-detail/product-detail.js

@@ -0,0 +1,141 @@
+// package-basic-data/pages/register/product-detail/product-detail.js
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+
+        /** 2种切换组件的options */
+        tagList: [{ name: '今日', id: 'today' }, { name: '近7天', id: 'nearly7days' }, { name: '近30天', id: 'nearly30days' }],
+        tagList2: [{ name: '本月', id: 'month' }, { name: '本年', id: 'year' }],
+        /** 3个加载loading(实际页面上是6个 因为左右切换无法同时显示两个所以3个就够了) */
+        filterBlur1: '0',
+        filterBlur2: '0',
+        filterBlur3: '0',
+        businessAreaStandardList:[
+            {
+                name:'财税',
+                check:true,                
+            },
+            {
+                name:'生产制造',
+                check:true,                
+            },
+            {
+                name:'全渠道管理',
+                check:true,                
+            },
+            {
+                name:'供应链',
+                check:true,                
+            },
+            {
+                name:'协同办公',
+                check:true,                
+            },
+            {
+                name:'企业级Pass平台',
+                check:false,                
+            },
+            {
+                name:'IPO',
+                check:false,                
+            },
+            {
+                name:'数据智能',
+                check:false,                
+            },
+        ],
+        businessAreaProfessionalList:[
+            {
+                name:'财税',
+                check:true,                
+            },
+            {
+                name:'生产制造',
+                check:true,                
+            },
+            {
+                name:'全渠道管理',
+                check:true,                
+            },
+            {
+                name:'供应链',
+                check:true,                
+            },
+            {
+                name:'协同办公',
+                check:true,                
+            },
+            {
+                name:'企业级Pass平台',
+                check:true,                
+            },
+            {
+                name:'IPO',
+                check:true,                
+            },
+            {
+                name:'数据智能',
+                check:true,                
+            },
+        ],
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload() {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh() {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom() {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage() {
+
+    }
+})

package-basic-data/pages/register/product-detail/product-detail.json

@@ -0,0 +1,4 @@
+{
+    "usingComponents": {},
+    "navigationBarTitleText": "产品详情"
+}

package-basic-data/pages/register/product-detail/product-detail.wxml

@@ -0,0 +1,81 @@
+<!-- 销售任务进度 -->
+<view class="task-progress">
+	<view class="task-progress-header">
+		<view class="task-progress-header-name">智云标准版</view>
+		<view class="task-progress-header-tags">
+			<view class="todo-view-title" style="display: flex;justify-content:space-between;align-items: center;">
+				<image src="/static/img/diamond.png" style="width:40rpx;height:40rpx; margin-right: 10rpx;" />
+				升级专业版
+			</view>
+		</view>
+	</view>
+	<view style="position: relative;">
+		<view class="task-progress-content">
+			<view class="task-progress-content-left">
+				<view style="padding-left: 30rpx;">免费开通</view>
+			</view>
+			<view class="task-progress-content-left" style="padding-right: 30rpx;">
+				<view>998用户/年</view>
+				<view>升级开通</view>
+			</view>
+		</view>
+
+	</view>
+
+</view>
+<!-- 适应规模 -->
+<view class="helper-view">
+	<!-- 顶部部分 -->
+	<view class="helper-view-header">
+		<view class="helper-view-header-name">适应规模</view>
+	</view>
+	<!-- 主体部分 -->
+	<view class="helper-view-content" style="position: relative;">
+		<view class="help-view-content-item">
+			<view class="help-view-content-item-important">
+				<view class="help-view-content-item-text"> 营收： 小于1亿</view>
+			</view>
+			<view class="help-view-content-item-important">
+				<view class="help-view-content-item-text"> 企业人数： 20-300人</view>
+			</view>
+		</view>
+
+		<view class="help-view-content-item">
+			<view class="help-view-content-item-important">
+				<view class="help-view-content-item-text"> 营收： 1亿-40亿</view>
+			</view>
+			<view class="help-view-content-item-important">
+				<view class="help-view-content-item-text"> 企业人数： 300-2000人</view>
+			</view>
+		</view>
+	</view>
+</view>
+<!-- 业务领域 -->
+<view class="helper-view">
+	<!-- 顶部部分 -->
+	<view class="helper-view-header">
+		<view class="helper-view-header-name">业务领域</view>
+	</view>
+	<!-- 主体部分 -->
+
+	<view class="helper-view-content " style="position: relative; ">
+		<view class="help-view-content-item" style="padding: 20rpx 0rpx 0 0;">
+			<view class="help-view-content-item-important" wx:for="{{businessAreaStandardList}}" wx:key="index" data-item="{{item}}" data-index="{{index}}">
+				<view class="help-view-content-item-text help-view-content-item-text_margin">
+					<image src="{{item.check?'/static/img/check.png':'/static/img/uncheck.png'}}" class="check" />
+					{{item.name}}
+				</view>
+			</view>
+		</view>
+		<view class="help-view-content-item" style="padding: 20rpx 0rpx 0 0;">
+			<view class="help-view-content-item-important" wx:for="{{businessAreaProfessionalList}}" wx:key="index" data-item="{{item}}" data-index="{{index}}">
+				<view class="help-view-content-item-text help-view-content-item-text_margin">
+					<image src="{{item.check?'/static/img/check.png':'/static/img/uncheck.png'}}" class="check" />
+					{{item.name}}
+				</view>
+			</view>
+		</view>
+	</view>
+</view>
+
+<dk-save-bottom flagTypeName="select-functional-permissions" bottomClass="{{true}}" bind:submit="toClose" bind:allClean="toAdd" /> 

package-basic-data/pages/register/product-detail/product-detail.wxss

@@ -0,0 +1,158 @@
+.helper-view {
+	margin-left: 34rpx;
+	width: calc(100% - 68rpx - 48rpx);
+	background: #FFFFFF;
+	box-shadow: 0px 10px 20px rgba(225, 229, 238, 0.6);
+	border-radius: 15rpx;
+	padding: 24rpx;
+	margin-top: 20rpx;
+}
+
+.helper-view-header {
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	font-weight: 600;
+}
+
+.helper-view-content {
+	display: flex;
+	flex-flow: wrap;
+	justify-content: space-between;
+	margin-top: 34rpx;
+}
+
+
+.help-view-content-item {
+	border-radius: 15rpx;
+	position: relative;
+	display: grid;
+	align-content: center;
+	width: 48%;
+	min-height: 138rpx;
+	background: #F8F8F8;
+	filter: blur(var(--filterBlur--));
+}
+
+
+
+.help-view-content-item-important {
+	font-weight: 600;
+	font-size: 13px;
+	font-family: 'PingFang SC';
+	color: #1B365D;
+	justify-content: left;
+	display: flex;
+	align-items: center;
+}
+
+.help-view-content-item-important-small {
+	font-style: normal;
+	font-weight: 400;
+	font-size: 10px;
+	font-family: 'PingFang SC';
+}
+
+.help-view-content-item-text {
+	font-style: normal;
+	font-weight: 400;
+	font-size: 13px;
+	color: #212835;
+	text-align: center;
+	margin-left: 10rpx;
+	font-family: 'PingFang SC';
+}
+
+.help-view-content-item-text_margin {
+	margin-bottom: 30rpx;
+}
+
+.check {
+	width: 25rpx;
+	height: 25rpx;
+	margin-right: 10rpx; 
+}
+
+.uncheck {
+	width: 25rpx;
+	height: 25rpx;
+	margin-right: 10rpx;
+	src: url('/static/img/uncheck.png');
+}
+
+.task-progress {
+	margin-left: 34rpx;
+	width: calc(100% - 68rpx);
+	background: #FFFFFF;
+	box-shadow: 0px 10px 20px rgba(225, 229, 238, 0.6);
+	border-radius: 15rpx;
+	margin-top: 30rpx;
+}
+
+.task-progress-header {
+	display: flex;
+	background: linear-gradient(90.12deg, #9BCBEB 0.13%, #D9F0FF 99.92%);
+	padding: 24rpx;
+	border-radius: 15rpx 15rpx 0px 0px;
+	align-items: center;
+	justify-content: space-between;
+}
+
+.task-progress-header-name {
+	font-style: normal;
+	font-weight: 500;
+	font-size: 16px;
+	color: #FFFFFF;
+	font-family: 'PingFang SC';
+}
+
+.task-progress-content {
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	padding: 24rpx;
+}
+
+.task-progress-content-left {
+	font-style: normal;
+	font-weight: 600;
+	font-family: 'PingFang SC';
+	font-size: 15px;
+	color: #1B365D;
+}
+
+
+
+.task-progress-content-right {
+	padding: 20rpx 0;
+	display: grid;
+	filter: blur(var(--filterBlur--));
+}
+
+.task-progress-content-right>view:nth-child(1) {
+	font-style: normal;
+	font-weight: 400;
+	font-size: 14px;
+	color: #1B365D;
+	text-align: right;
+	font-family: 'PingFang SC';
+}
+
+.task-progress-content-right>view:nth-child(2) {
+	font-style: normal;
+	font-weight: 400;
+	font-size: 10px;
+	color: #95A8CB;
+	margin-bottom: 12rpx;
+	text-align: right;
+	font-family: 'PingFang SC';
+}
+
+.task-progress-content-right>view:nth-child(3) {
+	font-style: normal;
+	font-weight: 400;
+	font-size: 10px;
+	color: #95A8CB;
+	text-align: right;
+	font-family: 'PingFang SC';
+}

pages/mine/mine.wxml

@@ -1,8 +1,7 @@
-
 <!-- 前台导入numberFormat.wxs -->
-<wxs src='/utils/numberFormat.wxs' module="numberFormat"></wxs> 
+<wxs src='/utils/numberFormat.wxs' module="numberFormat"></wxs>
 <!-- 加载图层 -->
-<loading wx:if="{{loading}}"></loading> 
+<loading wx:if="{{loading}}"></loading>
 <view class="head">
   <view class="company">
     <view>
@@ -420,12 +419,13 @@
 
     <view class="todo-view-title" style="display: flex;justify-content:space-between;align-items: center;">
       <image src="../../static/img/diamond.png" style="width:40rpx;height:40rpx; margin-right: 10rpx;" />
-    升级专业版</view>
+      升级专业版
+    </view>
   </view>
   <view style="height: 30rpx;"></view>
   <view class="todo-view" style="display: flex;justify-content:space-between;align-items: center;">
     <view class="todo-view-title">{{$t['recommendedGifts']}}</view>
-    <view style="font-size: 12px;color: grey;" >积分：3500</view>
+    <view style="font-size: 12px;color: grey;">积分：3500</view>
   </view>
   <view style="height: 59rpx;"></view>
   <view style="padding: 30rpx;">