参数设置 商户设置

api/pages/other/setting.js

@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * Copyright(c) 2024 dongke All rights reserved. / Confidential
+ * 类的信息：
+ *		1.程序名称：
+ *		2.功能描述：设置方法
+ * 编辑履历：
+ *		作者				日期					版本				修改内容
+ *		jyh		  	     2024-1-19       			1.00		       	新建
+ *******************************************************************************/
+module.exports = {
+    settingService: {
+        // 前缀
+        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-param-setting/company-param-setting'},
+          
+        }
+    }
+};

app.js

@@ -7,6 +7,7 @@ import './utils/prototype/prototypeString';
 import './utils/prototype/prototypeDatetime';
 import './mixins/mixins.js';
 import './api/pages/common/common.js';
+import './api/pages/other/setting.js';
 import './api/pages/core/user.js';
 import './api/pages/mst/staff.js';
 import './api/pages/mst/staffRight.js';

i18n/zh-CN.js

@@ -27,6 +27,16 @@ const home = {
   currentMonth:'本月',
   transactionAmount:'成交额',
   collectionAmount:'收款额',
+  registerCommany:'注册商户',
+  settingCommany:'商户设置',
+  standardVersion :'标准版',
+  flagshipVersion :'旗舰版',
+  recommendedGifts: '推荐有礼',
+  companyName: '公司名称',
+  headName: '负责人',
+  userCount:'用户数量',
+  shopCount:'门店数量',
+  communicationFeedback:'沟通反馈',
 }
 
 //  基础数据

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

@@ -1,66 +1,205 @@
-// package-basic-data/pages/register/company-param-setting/company-param-setting.js
+const Constants = require('@/utils/Constants.js');
+const util = require('@/utils/util.js')
+const mixins = require('@/mixins/index.js')
 Page({
-
-    /**
-     * 页面的初始数据
-     */
-    data: {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面加载
-     */
-    onLoad(options) {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面初次渲染完成
-     */
-    onReady() {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面显示
-     */
-    onShow() {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面隐藏
+  mixins: [mixins],
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    routeObjName: 'roleSensitive',
+    tableData: [],
+    formData: {},
+  },
+  /**
+     * @desc :   列表交换器选择事件全选
+     * @date : 2024/2/1 15:49
+     * @author : 姜永辉
      */
-    onHide() {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面卸载
-     */
-    onUnload() {
+  onChangeSwitch(e) {
+    console.log(e)
+    let formData = this.data.formData
+    let tableData = this.data.tableData
+    formData.checked = e.detail
+    if (tableData && tableData.length > 0) {
+      tableData.forEach(res => {
+        res.checked = e.detail
+        if (res.children && res.children.length > 0) {
+          res.children.forEach(it => {
+            it.checked = e.detail
+          })
+        }
+      })
+    }
 
-    },
+    this.setData({
+      formData: formData,
+      tableData: tableData
+    })
+  },
 
-    /**
-     * 页面相关事件处理函数--监听用户下拉动作
+  /**
+     * @desc :   列表交换器选择事件父级
+     * @date : 2024/2/1 15:49
+     * @author : 姜永辉
      */
-    onPullDownRefresh() {
-
-    },
-
-    /**
-     * 页面上拉触底事件的处理函数
+  onCheckedItem(e) {
+    console.log(e)
+    let _that = this
+    let index = e.currentTarget.dataset.index
+    let tableData = _that.data.tableData
+    tableData[index].checked = !tableData[index].checked
+    if (tableData[index].children && tableData[index].children.length > 0) {
+      console.log('list[index].children', tableData[index].children)
+      tableData[index].children.forEach(res => {
+        res.checked = tableData[index].checked
+      })
+    }
+    _that.setData({
+      tableData: tableData
+    })
+
+  },
+  /**
+     * @desc :   列表交换器选择事件子级
+     * @date : 2024/2/1 15:49
+     * @author : 姜永辉
      */
-    onReachBottom() {
+  onCheckedItem_(e) {
+    let index = e.currentTarget.dataset.index
+    let index_ = e.currentTarget.dataset.index_
+    let tableData = this.data.tableData
+    tableData[index].children[index_].checked = !tableData[index].children[index_].checked
+    if (tableData[index].children.filter(res => {
+      res.checked
+    }).length == tableData[index].children.length) {
+      tableData[index].checked = true
+    } else {
+      tableData[index].checked = false
+    }
+    this.setData({
+      tableData: tableData
+    })
+  },
 
-    },
 
-    /**
-     * 用户点击右上角分享
-     */
-    onShareAppMessage() {
 
+  /**
+   * @desc : 设置查询参数
+   * @date : 2024/2/1 15:49
+   * @author : 姜永辉
+   */
+  setSearchParams(params) {
+    if (this.data.id && this.data.id) {
+      params.roleId = this.data.id
     }
+    if (this.data.item && this.data.item.roleId) {
+      params.roleId = this.data.item.roleId
+    }
+    return params;
+  },
+  /**
+ * @desc :   加载数据
+ * @date : 2024/2/1 15:49
+ * @author : 姜永辉
+ */
+  getData(params) {
+    return this.excute(this.data.service, this.data.service.getRoleSensitive, params);
+  },
+
+  /**
+* @desc :   处理接口返回数据
+* @date : 2024/2/1 15:49
+* @author : 姜永辉
+*/
+  handleSearchData(tableData) {
+    this.setData({
+      tableData: util.convertToChildren(tableData, 'parentCode', 'itemCode')
+    })
+  },
+  /**
+ * @desc :   折叠面板多选框事件
+ * @date : 2024/2/1 15:49
+ * @author : 姜永辉
+ */
+  obtainList(e) {
+    this.setData({
+      tableData: e.detail.list
+    })
+  },
+
+  toAdd() {
+    let tableData = this.data.tableData
+    //格式化数据
+    let tableDataTemp = []
+    tableData.forEach(res => {
+      if (res.checked) {
+        tableDataTemp.push({
+          senItemCode: res.itemCode,
+          flgShow: res.checked
+        })
+      }
+      if (res.children && res.children.length > 0) {
+        res.children.forEach(it => {
+          if (it.checked) {
+            tableDataTemp.push({
+              senItemCode: it.itemCode,
+              flgShow: it.checked
+            })
+          }
+        })
+      }
+    })
+    //铭感信息跳转编辑
+    if (this.data.formType == Constants.formMode.edit) {
+      //调用接口修改权限
+      let formData = this.data.formData
+      formData.roleSensitiveList = tableDataTemp
+      formData.roleId = this.data.id
+      this.setData({
+        formData: JSON.stringify(this.data.formData)
+      })
+      let params = {}
+      this.save(params)
+    } else {
+      // 给父页面传递数据
+      const eventChannel = this.getOpenerEventChannel();
+      eventChannel.emit('bindData', {
+        showFlag: 'selectSensitiveData',
+        list: tableDataTemp
+      })
+      wx.navigateBack({
+        delta: 1
+      })
+    }
+
+  },
+
+  /**
+  * @desc : 批量修改敏感信息接口
+  * @date : 2024/2/1 15:49
+  * @author : 姜永辉
+  */
+  saveData(params) {
+    return this.excute(this.data.service, this.data.service.updateBatch, params);
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+    //接收父页面传递的参数
+    let that = this
+    const eventChannel = this.getOpenerEventChannel()
+    eventChannel.on('params', function (data) {
+      let formData = that.data.formData
+      formData.roleName = data.item ?  data.item.roleName : data.roleName
+      that.setData({
+        formData: formData,
+        id: data.item ? data.item.roleId : data.id,
+        formType: data.item ?  data.item.button.formType : data.formType
+      })
+    })
+  },
+ 
 })

package-basic-data/pages/register/company-param-setting/company-param-setting.json

@@ -1,3 +1,4 @@
 {
-    "usingComponents": {}
+    "usingComponents": {},
+    "navigationBarTitleText": "参数设置"
 }

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

@@ -1,2 +1,36 @@
-<!--package-basic-data/pages/register/company-param-setting/company-param-setting.wxml-->
-<text>package-basic-data/pages/register/company-param-setting/company-param-setting.wxml</text>
+<!-- 前台导入wxmlUtil.wxs -->
+<wxs src='/utils/wxmlUtil.wxs' module="wxmlUtil"></wxs>
+<loading wx:if="{{loading}}" loadingName="{{$t['loading']}}" backgroundColor="#f2f2f2;" opacity="0.8"></loading> 
+
+<!-- 数据列表区 -->
+<view wx:for="{{tableData}}" wx:for-item="item" wx:for-index="index" data-item="{{item}}" wx:key="index" class="main-class">
+  <view class="main-foot-2" style="position: relative;">
+    <view class="corner-view" style="padding:20rpx">
+      <view style="display: flex;">
+        <view class="corner-view-text font" style="width: 70%;">{{item.itemName}}</view>
+        <view style="width: 30%;text-align: right;">
+          <van-switch bind:change="onCheckedItem"  data-index="{{index}}" active-color="#00A7B5" checked="{{ item.checked }}" size="18px"></van-switch>
+        </view>
+
+      </view>
+
+    </view>
+
+    <view style="background-color: white;">
+      <view wx:for="{{item.children}}"  wx:for-item="item_" wx:for-index="index_" wx:key="index_" style="display: flex;padding:20rpx">
+        <view class="corner-view-text font" style="width: 70%;">{{item_.itemName}}</view>
+        <view style="width: 30%;text-align: right;">
+          <van-switch bind:change="onCheckedItem_"  data-index="{{index}}"  data-index_="{{index_}}" active-color="#00A7B5" checked="{{ item_.checked }}" size="18px"></van-switch>
+        </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/company-param-setting/company-param-setting.wxss

@@ -1 +1,8 @@
-/* package-basic-data/pages/register/company-param-setting/company-param-setting.wxss */
+.font {
+	font-family: PingFang HK;
+	font-size: 30rpx;
+	font-weight: 400;
+	line-height: 40rpx;
+	letter-spacing: 0em;
+	text-align: left;	
+  }

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

@@ -1,66 +1,76 @@
-// package-basic-data/pages/register/company-setting/company-setting.js
+const mixins = require('@/mixins/index.js')
+const app = getApp()
+const util = require('@/utils/util.js')
+const Constants = require('@/utils/Constants.js');
+const api = require('@/utils/api.js');
 Page({
-
+    mixins: [mixins],
     /**
      * 页面的初始数据
      */
     data: {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面加载
-     */
-    onLoad(options) {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面初次渲染完成
-     */
-    onReady() {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面显示
-     */
-    onShow() {
-
+        // 路由
+        routeObjName: 'setting',
+        cardList: ['main'],
+        contentObj: {
+            main: [
+                { code: 'standardVersion', type: 'str', readonly: 'true', title: mixins.$t('standardVersion') },
+                { 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') },
+            ],
+        },
     },
 
     /**
-     * 生命周期函数--监听页面隐藏
-     */
-    onHide() {
-
+    * @desc : 参数设置
+    * @date : 2024/2/1 15:49
+    * @author : 姜永辉
+    */
+    paramSetting(e) { 
+        wx.navigateTo({
+          url: this.data.route.companyRegister.url,
+          events: {
+            // 回调后，在这里给页面赋值
+            bandData: function (e) {
+            }
+          },
+          success: function (res) {
+            // 通过eventChannel向被打开页面传送数据 TODO 测试例子url是写死的，实际中，需要从route中读取
+            res.eventChannel.emit('params', {})
+          }
+        })
     },
 
-    /**
-     * 生命周期函数--监听页面卸载
-     */
-    onUnload() {
-
-    },
 
     /**
-     * 页面相关事件处理函数--监听用户下拉动作
-     */
-    onPullDownRefresh() {
-
+    * @desc : 加载数据
+    * @date : 2024/2/1 15:49
+    * @author : 姜永辉
+    */
+    loadInit() {
+        this.getCompanySetting()
     },
 
     /**
-     * 页面上拉触底事件的处理函数
-     */
-    onReachBottom() {
-
+   * @desc : 加载商户设置
+   * @date : 2022/5/15 16:49
+   * @author : 姜永辉
+   */
+    getCompanySetting() {
+        let param = {
+            dataSourceCode: 'purviewType',
+        }
+        api.request(Constants.BASIC_COMMON_API + 'get_wx_init_data', 'POST', param)
+            .then(res => {
+                if (res.data.code === Constants.SUCESS_CODE) {
+                    let list = res.data.data
+
+                }
+            })
     },
 
-    /**
-     * 用户点击右上角分享
-     */
-    onShareAppMessage() {
-
-    }
 })

package-basic-data/pages/register/company-setting/company-setting.json

@@ -1,3 +1,4 @@
 {
-    "usingComponents": {}
+    "usingComponents": {},
+    "navigationBarTitleText": "商户设置"
 }

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

@@ -1,2 +1,23 @@
-<!--package-basic-data/pages/register/company-setting/company-setting.wxml-->
-<text>package-basic-data/pages/register/company-setting/company-setting.wxml</text>
+<!-- 加载图层 -->
+<loading wx:if="{{loading}}"></loading>
+
+<!-- 销售任务进度 -->
+<view class="task-progress">
+  <view class="task-progress-header">
+    <view class="task-progress-header-name">商户信息</view>
+    <view class="task-progress-header-name">
+      <van-button size='mini' bind:click="paramSetting" type="default">参数设置
+      </van-button>
+    </view>
+  </view>
+</view>
+
+<!-- 列表区 -->
+<dk-form id="{{formName}}" routeObjName="{{routeObjName}}" cardList="{{cardList}}" contentObj="{{contentObj}}" model:value="{{formData}}" bind:chooseData="chooseData">
+</dk-form>
+
+<!--  保存 -->
+<view class="bottom-class">
+  <van-button custom-class="save-button-class" disabled="{{loading}}" loading="{{loading}}" bind:click="close" type="default">关闭
+  </van-button>
+</view>

package-basic-data/pages/register/company-setting/company-setting.wxss

@@ -1 +1,48 @@
-/* package-basic-data/pages/register/company-setting/company-setting.wxss */
+/**底部的样式*/
+.bottom-class{
+	position: fixed;
+	bottom: 20rpx;
+	width: 100%;
+	align-items: center;
+	justify-content: center;
+	border-top: 2rpx solid #efefef;
+	z-index: 2;
+	display: flex;
+  }  
+  /**底部保存按钮的样式*/
+  .save-button-class{
+	width: 640rpx;
+	background: #1B365D !important;
+	border-radius: 15rpx !important;
+	color:#fff !important;
+	font-size: 16px !important;
+	font-weight: 500 !important;
+  }
+
+  
+  .task-progress {
+	margin-left: 30rpx;
+	width: calc(100% - 60rpx);
+	background: #FFFFFF;
+	box-shadow: 0px 10px 20px rgba(225, 229, 238, 0.6);
+	border-radius: 15rpx;
+	margin-top: 30rpx;
+	margin-bottom: -15rpx;
+  }
+  
+  .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';
+  }

pages/mine/mine.js

@@ -2,26 +2,34 @@
  * Copyright(c) 2022 dongke All rights reserved. / Confidential
  * 类的信息：
  *		1.程序名称：
- *		2.功能描述：我的
+ *		2.功能描述：我的设置
  * 编辑履历：
  *		作者				日期					版本				修改内容
- *		于继渤		        2022-0-12	            1.00		   	    
+ *		姜永辉		  2024-2-12	    1.00		   	    
  *******************************************************************************/
 const api = require('@/utils/api.js');
-
+const common = require('@/utils/common.js')
 const Constants = require('@/utils/Constants.js');
 const util = require('@/utils/util.js')
-const common = require('@/utils/common.js')
+const mixins = require('@/mixins/index.js')
+
 import { getReportQuery, getDateQuery } from '/mine-report-params.js'
 
 const app = getApp()
 
 Page({
-
+  mixins: [mixins],
   /**
    * 页面的初始数据
    */
   data: {
+    companyName: '沈阳东科软件有限公司',
+    staffName: '王暖暖',
+    orgName: '沈阳浑南红心美凯龙店',
+    // 路由
+    routeObjName: 'setting',
+
+
     appCount: 0,
     noticeCount: 0,
 
@@ -125,9 +133,18 @@ Page({
     * @date : 2022/5/12 13:49
     * @author : 于继渤
     */
-  toSetting() {
+  toSetting() { 
     wx.navigateTo({
-      url: './setting/setting',
+      url: this.data.route.companySetting.url,
+      events: {
+        // 回调后，在这里给页面赋值
+        bandData: function (e) {
+        }
+      },
+      success: function (res) {
+        // 通过eventChannel向被打开页面传送数据 TODO 测试例子url是写死的，实际中，需要从route中读取
+        res.eventChannel.emit('params', {})
+      }
     })
   },
   /**
@@ -298,11 +315,11 @@ Page({
     // let waitApprovalflg = common.hasPageUUidRight(Constants.PAGE_RIGHT.WAITAPPROVAL)
     // let storeManagerFlg = common.hasPageUUidRight(Constants.PAGE_RIGHT.STORE_MANAGER)
     this.setData({
-      storeManagerFlg:false,
-      customerflg:false,
-      orderflg:false,
-      receivecustomersflg:false,
-      waitApprovalflg:false,
+      storeManagerFlg: false,
+      customerflg: false,
+      orderflg: false,
+      receivecustomersflg: false,
+      waitApprovalflg: false,
       version: wx.getAccountInfoSync().miniProgram.version,
     })
     /**
@@ -330,79 +347,6 @@ Page({
   },
 
 
-  /** 查询页面展示的所有 */
-  getReportData() {
-    let params = {
-      storeHelper: getReportQuery('storeHelper', 'nearly7days'),
-      staffHelper: getReportQuery('staffHelper', 'nearly7days'),
-      storeOrderRate: Object.assign(getReportQuery('storeOrderRate', null), { type: 'f_kpi_order_rate_month' }),
-      staffOrderRate: Object.assign(getReportQuery('staffOrderRate', null), { type: 'f_kpi_order_rate_month' }),
-      storeRepayRate: Object.assign(getReportQuery('storeRepayRate', null), { type: 'f_kpi_repay_rate_month' }),
-      staffRepayRate: Object.assign(getReportQuery('staffRepayRate', null), { type: 'f_kpi_repay_rate_month' }),
-    }
-
-    api.request(Constants.WX_REPORT + 'select_report_batch', 'POST', params).then(res => {
-
-      if (res.data.code === 200) {
-        this.setData({
-          storeHelper: res.data.data.storeHelper,
-          staffHelper: res.data.data.staffHelper,
-          storeOrderRate: res.data.data.storeOrderRate,
-          staffOrderRate: res.data.data.staffOrderRate,
-          storeRepayRate: res.data.data.storeRepayRate,
-          staffRepayRate: res.data.data.staffRepayRate
-        })
-      } else {
-        console.error("获取报表失败", res)
-      }
-    })
-  },
-
-  /** 查询单个(助手) */
-  getReportDataSingle(e) {
-    let elementQuery = e.currentTarget.dataset
-    let params = getReportQuery(elementQuery.querytype, e.detail.id)
-    this.setData({
-      ['filterBlur' + elementQuery.filterindex]: '5px'
-    })
-    api.request(Constants.WX_REPORT + 'select_report', 'POST', params).then(res => {
-      setTimeout(() => {
-        this.setData({
-          ['filterBlur' + elementQuery.filterindex]: '0'
-        })
-        if (res.data.code === 200) {
-          this.setData({
-            [elementQuery.querytype]: res.data.data,
-          })
-        } else {
-          console.error("获取报表失败", res)
-        }
-      }, 500); /** loading效果 记得去掉 */
-    })
-  },
-  /** 查询单个的(kpi) */
-  getReportDataSingleRate(e) {
-    let elementQuery = e.currentTarget.dataset
-    let params = Object.assign(getReportQuery(elementQuery.querytype, null), { type: elementQuery.funcname + e.detail.id })
-    this.setData({
-      ['filterBlur' + elementQuery.filterindex]: '5px'
-    })
-    api.request(Constants.WX_REPORT + 'select_report', 'POST', params).then(res => {
-      setTimeout(() => {
-        this.setData({
-          ['filterBlur' + elementQuery.filterindex]: '0'
-        })
-        if (res.data.code === 200) {
-          this.setData({
-            [elementQuery.querytype]: res.data.data,
-          })
-        } else {
-          console.error("获取报表失败", res)
-        }
-      }, 500);/** loading效果 记得去掉 */
-    })
-  },
-
   /**
    * @desc : 跳转审批中心
    * @date : 2022/8/09 9:49
@@ -421,8 +365,8 @@ Page({
       this.setData({
         menuBtnInfo: wx.getMenuButtonBoundingClientRect()
       })
-     
- 
+
+
     }
   },
   /**

pages/mine/mine.wxml

@@ -1,11 +1,12 @@
-<wxs src='../../utils/numberFormat.wxs' module="numberFormat"></wxs>
-<!-- loading -->
-<loading wx:if="{{loading}}" loadingName="加载中" backgroundColor="#f2f2f2;" opacity="0.8"></loading>
-<loading wx:if="{{loadingShow}}" loadingName="加载中" backgroundColor="#f2f2f2;" opacity="0"></loading>
+
+<!-- 前台导入numberFormat.wxs -->
+<wxs src='/utils/numberFormat.wxs' module="numberFormat"></wxs> 
+<!-- 加载图层 -->
+<loading wx:if="{{loading}}"></loading> 
 <view class="head">
   <view class="company">
     <view>
-      沈阳东科软件有限公司
+      {{companyName}}
       <image src="/static/img/triangle.png" style="width: 28rpx;height:28rpx;"></image>
     </view>
     <!-- 头像 -->
@@ -15,7 +16,7 @@
     <!-- 昵称 -->
     <view class="nick-name" style="display: flex;width: 100%;">
       <view style="width: 99%;">
-        你好 王暖暖
+        你好 {{staffName}}
       </view>
       <view style="text-align: right;margin-right: 10rpx;" bindtap="toNotice">
         <view class="notice-view">
@@ -27,7 +28,7 @@
     <!-- 门店 -->
     <view class="store">
       <view>
-        <view> 沈阳浑南红心美凯龙店</view>
+        <view> {{orgName}}</view>
         <view wx:if="{{version}}" style="width:77vw;text-align-last: right;font-size: 11px;display: flex; justify-content: flex-end;"> 当前版本号: {{version}}
           <van-icon name="upgrade" size="20px" bind:click="checkHasManualUpdate" />
         </view>
@@ -407,11 +408,11 @@
 
   <view style="height: 39rpx;"></view>
   <view class="todo-view">
-    <view class="todo-view-title" catch:tap="register">注册商户</view>
+    <view class="todo-view-title" catch:tap="register">{{$t['registerCommany']}}</view>
   </view>
   <view style="height: 30rpx;"></view>
   <view class="todo-view">
-    <view class="todo-view-title">商户设置</view>
+    <view class="todo-view-title" catch:tap="toSetting">{{$t['settingCommany']}}</view>
   </view>
   <view style="height: 30rpx;"></view>
   <view class="todo-view" style="display: flex;justify-content:space-between;align-items: center;">
@@ -423,7 +424,7 @@
   </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">推荐有礼</view>
+    <view class="todo-view-title">{{$t['recommendedGifts']}}</view>
     <view style="font-size: 12px;color: grey;" >积分：3500</view>
   </view>
   <view style="height: 59rpx;"></view>