Merge branch 'lin_fix' of ssh://gogs.zfire.top:2222/zfire-front/zfire-newmall-admin into develop

src/views/iframeView.vue

@@ -11,7 +11,7 @@ export default {
   },
   computed: {
     url() {
-      if (!!~this.$route.meta.url.indexOf("?toekn=")) {
+      if (!!~this.$route.meta.url.indexOf("?x-token=")) {
         return this.$route.meta.url && this.token ? `${this.$route.meta.url}${this.token}` : ''
       } else {
         return this.$route.meta.url

src/views/workOrder/workOrderPool/detailModule/workOrderInfo/mixins/serviceInfo.js

@@ -65,7 +65,7 @@ export default {
                 filterable: true
               },
               formItemAttributes: {
-                label: '工单渠道',
+                label: '工单来源',
                 prop: 'orderChannelId',
                 rules: this.formOptions.orderChannelId.isRules
               },
@@ -90,7 +90,7 @@ export default {
                 disabled: !this.formOptions.orderChannelId.isEdit,
               },
               formItemAttributes: {
-                label: '工单渠道',
+                label: '工单来源',
                 prop: 'orderChannelId',
                 rules: this.formOptions.orderChannelId.isRules
               }
@@ -145,7 +145,7 @@ export default {
           label: item.orderSmallTypeText
         }))
       })
-      // 获取工单渠道
+      // 获取工单来源
       getDataDictionary({ "pageNum": 1, "pageSize": -1, "params": [{ "param": "a.status", "compare": "=", "value": "ON" }, { "param": "a.dict_type", "compare": "=", "value": "ORDER_CHANNEL" }] }).then(res => {
         this.orderChannels = res.data.records.map(item => ({
           value: item.dictCode,

src/views/workOrder/workOrderPool/detailModule/workOrderInfo/mixins/workOrderLogic.js

@@ -27,7 +27,7 @@ var initdata_ = {
   // 服务信息--------------------------------
   // 工单类型
   orderSmallType: "",
-  // 工单渠道
+  // 工单来源
   orderChannelId: "",
   // 预约上门日期
   appointmentTime: "",