1

components/Yl_field/index.js

@@ -165,7 +165,7 @@ Component({
             } = e.target.dataset,
                 value = e.detail.value;
             this.setData({
-                [`form[${index}].value`]: item.range[value][item.rangeKey],
+                [`form[${index}].value`]: item.range[value][item.selectKey||item.rangeKey],
                 [`form[${index}].rangeIndex`]: value,
                 [`form[${index}].error`]: false,
             });

components/Yl_field/index.wxml

@@ -13,11 +13,11 @@
         </view>
         <picker mode='selector' range="{{item.range}}" range-key='{{item.rangeKey}}' value="{{item.rangeIndex}}" disabled="{{item.disabled}}" data-item="{{item}}" data-index="{{index}}" bindchange="bindSelectorChange">
           <view class="content">
-            <text wx:if="{{item.value}}" style="color:{{item.disabled?'#C8C9CC':'#000'}};">{{item.value}}</text>
-            <text wx:else style="color: {{item.error?'#EE4C4E':''}};">{{item.placeholder}}</text>
+            <text wx:if="{{item.value}}" style="color:{{item.disabled?'#C8C9CC':'#000'}};">{{language[item.value]||item.value}}</text>
+            <text wx:else style="color: {{item.error?'#EE4C4E':''}};">{{language[item.placeholder]||item.placeholder}}</text>
           </view>
         </picker>
-        <view wx:if="{{item.errMsg}}" class="error-tips">{{item.errMsg}}</view>
+        <view wx:if="{{item.errMsg}}" class="error-tips">{{language[item.errMsg]||item.errMsg}}</view>
       </view>
     </view>
     <!-- 日期选择器 -->
@@ -36,7 +36,7 @@
             <text wx:else style="color: {{item.error?'#EE4C4E':''}};">{{language[item.placeholder]||item.placeholder}}</text>
           </view>
         </picker>
-        <view wx:if="{{item.errMsg}}" class="error-tips">{{item.errMsg}}</view>
+        <view wx:if="{{item.errMsg}}" class="error-tips">{{language[item.errMsg]||item.errMsg}}</view>
       </view>
     </view>
     <!-- 日期范围选择器 -->
@@ -60,7 +60,7 @@
             <text wx:else style="color: {{item.error?'#EE4C4E':''}};">{{language[item.placeholder[1]]||item.placeholder[1]}}</text>
           </picker>
         </view>
-        <view wx:if="{{item.errMsg}}" class="error-tips">{{item.errMsg}}</view>
+        <view wx:if="{{item.errMsg}}" class="error-tips">{{language[item.errMsg]||item.errMsg}}</view>
       </view>
     </view>
     <!-- 时间选择器 -->
@@ -79,7 +79,7 @@
             <text wx:else style="color: {{item.error?'#EE4C4E':''}};">{{language[item.placeholder]||item.placeholder}}</text>
           </view>
         </picker>
-        <view wx:if="{{item.errMsg}}" class="error-tips">{{item.errMsg}}</view>
+        <view wx:if="{{item.errMsg}}" class="error-tips">{{language[item.errMsg]||item.errMsg}}</view>
       </view>
     </view>
     <!-- 省市县选择器 -->
@@ -98,7 +98,7 @@
             <text wx:else style="color: {{item.error?'#EE4C4E':''}};">{{language[item.placeholder]||item.placeholder}}</text>
           </view>
         </picker>
-        <view wx:if="{{item.errMsg}}" class="error-tips">{{item.errMsg}}</view>
+        <view wx:if="{{item.errMsg}}" class="error-tips">{{language[item.errMsg]||item.errMsg}}</view>
       </view>
     </view>
     <!-- 性别 -->
@@ -116,7 +116,7 @@
             </view>
           </van-radio-group>
         </view>
-        <view wx:if="{{item.errMsg}}" class="error-tips">{{item.errMsg}}</view>
+        <view wx:if="{{item.errMsg}}" class="error-tips">{{language[item.errMsg]||item.errMsg}}</view>
       </view>
     </view>
     <!-- 单选 选择器 -->
@@ -131,7 +131,7 @@
             <van-radio wx:for="{{item.radioList}}" wx:for-item="it" wx:for-index="i" wx:key="name" icon-size="16" custom-class="radio {{i != 0&&item.direction!='horizontal' ? 'radio_margin_top' : '' }}" name="{{it.id}}">{{language[it.name]||it.name}}</van-radio>
           </van-radio-group>
         </view>
-        <view wx:if="{{item.errMsg}}" class="error-tips">{{item.errMsg}}</view>
+        <view wx:if="{{item.errMsg}}" class="error-tips">{{language[item.errMsg]||item.errMsg}}</view>
       </view>
     </view>
     <!-- 异步类型选择 -->
@@ -146,7 +146,7 @@
           <text wx:else style="color: {{item.error?'#EE4C4E':''}};">{{language[item.placeholder]||item.placeholder}}</text>
           <van-icon name="arrow" style="flex-shrink: 0; margin-top: 12rpx;" />
         </view>
-        <view wx:if="{{item.errMsg}}" class="error-tips">{{item.errMsg}}</view>
+        <view wx:if="{{item.errMsg}}" class="error-tips">{{language[item.errMsg]||item.errMsg}}</view>
       </view>
     </view>
     <!-- 跳转路由选择 值使用数组，0保存显示名称，1保存ID -->
@@ -157,14 +157,14 @@
       </view>
       <view style="position: relative;">
         <view class="content" style="justify-content: space-between; display: flex; align-items: flex-start;" data-item="{{item}}" bindtap="route">
-          <text wx:if="{{item.value.length}}" style="color:{{item.disabled?'#C8C9CC':'#000'}};flex: 1;">{{item.value[0]}}</text>
+          <text wx:if="{{item.value.length}}" style="color:{{item.disabled?'#C8C9CC':'#000'}};flex: 1;">{{language[item.value[0]]||item.value[0]}}</text>
           <text wx:else style="color: {{item.error?'#EE4C4E':''}};flex: 1;">{{language[item.placeholder]||item.placeholder}}</text>
           <view wx:if="{{item.slot}}">
             <slot name="{{item.slot}}" />
           </view>
           <van-icon name="arrow" style="flex-shrink: 0; margin-top: 12rpx;" />
         </view>
-        <view wx:if="{{item.errMsg}}" class="error-tips">{{item.errMsg}}</view>
+        <view wx:if="{{item.errMsg}}" class="error-tips">{{language[item.errMsg]||item.errMsg}}</view>
       </view>
     </view>
     <!-- 固定电话输入 -->
@@ -177,7 +177,7 @@
         <view class="content telephone">
           <input class="area-code" disabled="{{item.disabled||false}}" placeholder-class='telephone-p' data-item="{{item}}" data-i="0" bindinput="inputChange" type="number" value="{{item.value[0]}}" maxlength='4' placeholder="区号" /><text>-</text><input disabled="{{item.disabled||false}}" class="phone" placeholder-class='telephone-p' data-item="{{item}}" data-i="1" bindinput="inputChange" type="number" value="{{item.value[1]}}" maxlength='8' placeholder="号码" />
         </view>
-        <view wx:if="{{item.errMsg}}" class="error-tips">{{item.errMsg}}</view>
+        <view wx:if="{{item.errMsg}}" class="error-tips">{{language[item.errMsg]||item.errMsg}}</view>
       </view>
     </view>
     <!-- 输入框 -->

components/organization/index.wxml

@@ -5,7 +5,7 @@
             {{language[item.label]||item.label}}
         </view>
         <view class="tabs-box" wx:if="{{dimissionF && index==0}}">
-            <view class="item {{isleave == item.value?'active':''}}" wx:for="{{tabs}}" wx:key="{{item.value}}" data-value="{{item.value}}" bind:tap="changLeave">{{item.name}}</view>
+            <view class="item {{isleave == item.value?'active':''}}" wx:for="{{tabs}}" wx:key="{{item.value}}" data-value="{{item.value}}" bind:tap="changLeave">{{language[item.name]||item.name}}</view>
         </view>
     </view>
     <view class="content">

packageA/achievement/index.js

@@ -76,7 +76,7 @@ Page({
         }
       } else if (length <= 8) {
         return { //万-千万
-          show: CNY(currency(n).divide(10000)).replace(regexp, '$1') + '万',
+          show: CNY(currency(n).divide(wx.getStorageSync('languagecode')=='ZH' ? 10000 : 1000)).replace(regexp, '$1') + '万',
           value: CNY(n)
         }
       } else {
@@ -229,13 +229,13 @@ Page({
         res[key].outamount = conversion(res[key].outamount);
         res[key].invoiceamount = conversion(res[key].invoiceamount);
         //差额
-        res[key].unamount = CNY(currency(res[key].unamount).divide(10000), '') - 0;
+        res[key].unamount = CNY(currency(res[key].unamount).divide(wx.getStorageSync('languagecode')=='ZH' ? 10000 : 1000), '') - 0;
         res[key].unamountcolor = res[key].unamount >= 0 ? '#5AB73F' : '#EB4B5C';
 
-        res[key].unoutamount = CNY(currency(res[key].unoutamount).divide(10000), '') - 0;
+        res[key].unoutamount = CNY(currency(res[key].unoutamount).divide(wx.getStorageSync('languagecode')=='ZH' ? 10000 : 1000), '') - 0;
         res[key].unoutamountcolor = res[key].unoutamount >= 0 ? '#5AB73F' : '#EB4B5C';
 
-        res[key].uninvoiceamount = CNY(currency(res[key].uninvoiceamount).divide(10000), '') - 0;
+        res[key].uninvoiceamount = CNY(currency(res[key].uninvoiceamount).divide(wx.getStorageSync('languagecode')=='ZH' ? 10000 : 1000), '') - 0;
         res[key].uninvoiceamountcolor = res[key].uninvoiceamount >= 0 ? '#5AB73F' : '#EB4B5C';
         //达成率
         res[key].wcamount = currency(res[key].wcamount).multiply(100) + '%';

packageA/offers/modules/pettyExpense/update.js

@@ -30,25 +30,30 @@ Page({
             range: [{
                     "unitid": 2,
                     "rowindex": "1",
-                    "unitname": "个"
+                    "unitname": "个",
+                    "name": getApp().globalData.Language.getMapText("个")
                 },
                 {
                     "unitid": 3,
                     "rowindex": "2",
-                    "unitname": "米"
+                    "unitname": "米",
+                    "name": getApp().globalData.Language.getMapText('米')
                 },
                 {
                     "unitid": 4,
                     "rowindex": "3",
-                    "unitname": "千克"
+                    "unitname": "千克",
+                    "name": getApp().globalData.Language.getMapText('千克')
                 },
                 {
                     "unitid": 5,
                     "rowindex": "4",
-                    "unitname": "克"
+                    "unitname": "克",
+                    "name": getApp().globalData.Language.getMapText('克')
                 }
             ],
-            rangeKey: "unitname",
+            rangeKey: "name",
+            selectKey: "unitname",
             rangeIndex: "",
             value: "",
             placeholder: "计量单位",
@@ -76,7 +81,7 @@ Page({
     },
     onLoad(options) {
         sa_quotedpriceid = options.id;
-        getApp().globalData.Language.getLanguagePackage(this, '添加费用');
+        getApp().globalData.Language.getLanguagePackage(this, '添加费用');
     },
     submit() {
         let content = this.selectComponent("#Form").submit();

packageA/publicClue/addClue.js

@@ -206,7 +206,8 @@ Page({
             errMsg: "",
             type: "selector",
             range: [],
-            rangeKey: "tradefield",
+            rangeKey: "name",
+            selectKey: "tradefield",
             rangeIndex: "",
             value: "",
             placeholder: "领域",
@@ -321,7 +322,10 @@ Page({
             console.log("获取领域", res)
             if (res.msg == '成功') {
                 let item = form.find(v => v.label == '领域');
-                item.range = res.msg == '成功' ? res.data : [];
+                item.range = res.msg == '成功' ? res.data.map(v => {
+                    v.name = getApp().globalData.Language.getMapText(v.tradefield)
+                    return v
+                }) : [];
                 this.setData({
                     form
                 })

packageA/saleAdmin/insert.js

@@ -237,7 +237,8 @@ Page({
                 errMsg: "",
                 type: "selector",
                 range: [],
-                rangeKey: "tradefield",
+                rangeKey: "name",
+                selectKey: "tradefield",
                 rangeIndex: "",
                 value: "",
                 placeholder: "领域",
@@ -439,7 +440,10 @@ Page({
         }).then(res => {
             console.log("获取领域", res)
             let item = form.find(v => v.label == '领域');
-            item.range = res.msg == '成功' ? res.data : [];
+            item.range = res.msg == '成功' ? res.data.map(v => {
+                v.name = getApp().globalData.Language.getMapText(v.tradefield)
+                return v
+            }) : [];
             this.setData({
                 form
             })

packageA/saleClue/addClue.js

@@ -198,7 +198,8 @@ Page({
                 errMsg: "",
                 type: "selector",
                 range: [],
-                rangeKey: "tradefield",
+                rangeKey: "name",
+                selectKey: "tradefield",
                 rangeIndex: "",
                 value: "",
                 placeholder: "领域",
@@ -316,7 +317,10 @@ Page({
         }).then(res => {
             console.log("获取领域", res)
             let item = form.find(v => v.label == '领域');
-            item.range = res.msg == '成功' ? res.data : [];
+            item.range = res.msg == '成功' ? res.data.map(v => {
+                v.name = getApp().globalData.Language.getMapText(v.tradefield)
+                return v
+            }) : [];
             this.setData({
                 form
             })

packageA/saleClue/change.js

@@ -160,7 +160,8 @@ Page({
                 errMsg: "",
                 type: "selector",
                 range: [],
-                rangeKey: "tradefield",
+                rangeKey: "name",
+                selectKey: "tradefield",
                 rangeIndex: "",
                 value: "",
                 placeholder: "领域",
@@ -243,7 +244,10 @@ Page({
         }).then(res => {
             console.log("获取领域", res)
             let item = this.data.form.find(v => v.label == '领域');
-            item.range = res.msg == '成功' ? res.data : [];
+            item.range = res.msg == '成功' ? res.data.map(v => {
+                v.name = getApp().globalData.Language.getMapText(v.tradefield)
+                return v
+            }) : [];
             this.setData({
                 form: this.data.form
             })

packageA/salesHourglass/index.js

@@ -16,12 +16,13 @@ const _Http = getApp().globalData.http,
             }
         } else if (length <= 8) {
             return { //万-千万
-                show: CNY(currency(n).divide(10000)).replace(regexp, '$1') + '万元',
+                
+                show: CNY(currency(n).divide(wx.getStorageSync('languagecode')=='ZH' ? 10000 : 1000)).replace(regexp, '$1') + getApp().globalData.Language.getMapText('万元'),
                 value: CNY(n)
             }
         } else {
             return { //亿
-                show: CNY(currency(n).divide(100000000)).replace(regexp, '$1') + '亿',
+                show: CNY(currency(n).divide(100000000)).replace(regexp, '$1') + getApp().globalData.Language.getMapText('亿'),
                 value: CNY(n)
             }
         }
@@ -201,7 +202,7 @@ Page({
             if (res.data.length) res.data.pop();
             let full = Math.max(...res.data.map(v => v.wide));
             let statistics = res.data.map((v, i) => {
-                v.action = v.stagename
+                v.action = getApp().globalData.Language.getMapText(v.stagename)
                 v.zhl = i == 0 ? '' : getApp().globalData.Language.getMapText('转换率') + `:${(v.zhl * 100).toFixed(2)}%`
                 v.percent = v.wide / full;
                 v.totalinvestment = conversion(v.totalinvestment).value

utils/Http.js

@@ -6,12 +6,12 @@ class HTTP {
             url: "https://oms.idcgroup.com.cn:8079"
         }, {
             name: "开发环境",
-            url: "http://61.164.207.46:8000"
+            url: "http://61.164.207.46:8003"
         }]
         if (this.ENV === 'release') { // 正式版
             this.baseUrl = "https://oms.idcgroup.com.cn:8079";
         } else {
-            this.baseUrl = "http://61.164.207.46:8000";
+            this.baseUrl = "http://61.164.207.46:8003";
             // this.baseUrl = "https://oms.idcgroup.com.cn:8079";
         }