Merge branch '蓝色' into 绿色

packageA/publicClue/addClue.js

@@ -286,7 +286,7 @@ Page({
                     }
                     return v
                 }),
-                'form[0].value': data.enterprisename_customer,
+                'form[1].value': data.enterprisename_customer,
                 'content.sat_orderclueid': data.sat_orderclueid,
                 'content.sat_campaignid': data.sat_campaignid
             })
@@ -466,9 +466,9 @@ Page({
     }) {
         let item = detail;
         this.setData({
-            [`form[0].value`]: item.companyName,
-            [`form[5].value`]: [item.regProvince ? item.regProvince : item.regCity, item.regCity, item.regArea],
-            [`form[6].value`]: item.address,
+            [`form[1].value`]: item.companyName,
+            [`form[6].value`]: [item.regProvince ? item.regProvince : item.regCity, item.regCity, item.regArea],
+            [`form[7].value`]: item.address,
         })
     },
     queryClient() {

packageA/saleAdmin/insert.js

@@ -26,16 +26,6 @@ Page({
         const isHy = ['HY', "YOSTEST1"].includes(wx.getStorageSync('userMsg').siteid)
         if (options.sat_orderclueid) sat_orderclueid = this.data.content.sat_orderclueid;
         let form = [{
-                label: "项目名称",
-                error: false,
-                errMsg: "",
-                type: "textarea",
-                value: "",
-                placeholder: "项目名称",
-                valueName: "projectname",
-                checking: "base",
-                required: false
-            }, {
                 label: "是否上图",
                 error: false,
                 errMsg: "",
@@ -53,6 +43,16 @@ Page({
                 required: false, //必填
                 direction: "horizontal",
                 interrupt: true
+            }, {
+                label: "项目名称",
+                error: false,
+                errMsg: "",
+                type: "textarea",
+                value: "",
+                placeholder: "项目名称",
+                valueName: "projectname",
+                checking: "base",
+                required: false
             }, {
                 label: "客户(企业)",
                 error: false,
@@ -399,7 +399,7 @@ Page({
             this.setData({
                 form,
                 'form[0].value': data.isuppictured + '',
-                'form[1].value': data.enterprisename_customer || data.enterprisename || "",
+                'form[2].value': data.enterprisename_customer || data.enterprisename || "",
                 'form[18].disabled': sys_enterpriseid == 0,
                 'form[18].params.content.sys_enterpriseid': sys_enterpriseid,
                 'content.sa_customersid': data.sa_customersid || 0
@@ -698,7 +698,7 @@ Page({
     }) {
         let item = detail;
         this.setData({
-            [`form[1].value`]: item.companyName,
+            [`form[0].value`]: item.companyName,
             [`form[7].value`]: [item.regProvince ? item.regProvince : item.regCity, item.regCity, item.regArea],
             [`form[8].value`]: item.address,
         })

packageA/saleClue/addClue.js

@@ -282,7 +282,7 @@ Page({
                     }
                     return v
                 }),
-                'form[0].value': data.enterprisename_customer || data.enterprisename || "",
+                'form[1].value': data.enterprisename_customer || data.enterprisename || "",
                 'content.sat_orderclueid': data.sat_orderclueid || 0,
                 'content.sa_customersid': data.sa_customersid || 0,
                 'content.sat_campaignid': data.sat_campaignid || 0
@@ -459,9 +459,9 @@ Page({
     }) {
         let item = detail;
         this.setData({
-            [`form[0].value`]: item.companyName,
-            [`form[5].value`]: [item.regProvince ? item.regProvince : item.regCity, item.regCity, item.regArea],
-            [`form[6].value`]: item.address,
+            [`form[1].value`]: item.companyName,
+            [`form[6].value`]: [item.regProvince ? item.regProvince : item.regCity, item.regCity, item.regArea],
+            [`form[7].value`]: item.address,
             "content.co_taxno": item.taxNum,
             "content.co_name": item.legalPerson,
             "content.co_phonenumber": item.phone,

project.private.config.json

@@ -1,58 +1,58 @@
 {
-    "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
-    "setting": {
-        "urlCheck": false,
-        "autoAudits": false,
-        "compileHotReLoad": true,
-        "bigPackageSizeSupport": false
-    },
-    "libVersion": "3.8.2",
-    "condition": {
-        "miniprogram": {
-            "list": [
-                {
-                    "name": "salesPanel/dataOverview/index",
-                    "pathName": "salesPanel/dataOverview/index",
-                    "query": "",
-                    "scene": null,
-                    "launchMode": "default"
-                },
-                {
-                    "name": "销售漏斗",
-                    "pathName": "salesPanel/salesHourglass/index",
-                    "query": "",
-                    "launchMode": "default",
-                    "scene": null
-                },
-                {
-                    "name": "packageA/salesHourglass/index",
-                    "pathName": "packageA/salesHourglass/index",
-                    "query": "",
-                    "launchMode": "default",
-                    "scene": null
-                },
-                {
-                    "name": "portrayal/details/project",
-                    "pathName": "portrayal/details/project",
-                    "query": "id=8286",
-                    "launchMode": "default",
-                    "scene": null
-                },
-                {
-                    "name": "salesPanel/index/index",
-                    "pathName": "salesPanel/index/index",
-                    "query": "",
-                    "launchMode": "default",
-                    "scene": null
-                },
-                {
-                    "name": "数据总揽",
-                    "pathName": "salesPanel/dataOverview/index",
-                    "query": "",
-                    "launchMode": "default",
-                    "scene": null
-                }
-            ]
+  "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
+  "setting": {
+    "urlCheck": false,
+    "autoAudits": false,
+    "compileHotReLoad": true,
+    "bigPackageSizeSupport": false
+  },
+  "libVersion": "3.8.11",
+  "condition": {
+    "miniprogram": {
+      "list": [
+        {
+          "name": "salesPanel/dataOverview/index",
+          "pathName": "salesPanel/dataOverview/index",
+          "query": "",
+          "scene": null,
+          "launchMode": "default"
+        },
+        {
+          "name": "销售漏斗",
+          "pathName": "salesPanel/salesHourglass/index",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
+          "name": "packageA/salesHourglass/index",
+          "pathName": "packageA/salesHourglass/index",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
+          "name": "portrayal/details/project",
+          "pathName": "portrayal/details/project",
+          "query": "id=8286",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
+          "name": "salesPanel/index/index",
+          "pathName": "salesPanel/index/index",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
+          "name": "数据总揽",
+          "pathName": "salesPanel/dataOverview/index",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
         }
+      ]
     }
+  }
 }