Merge branch '蓝色' into 测试

packageA/opponent/add.js

@@ -68,10 +68,11 @@ Page({
     onLoad(options) {
         if (options.data) {
             let data = JSON.parse(options.data);
+            console.log("data",data)
             this.setData({
                 disabled: false,
                 form: this.data.form.map(v => {
-                    v.value = data.province ? [data.province, data.city, data.county] : []
+                    v.value = data[v.valueName] ||''
                     return v
                 }),
                 "content.sa_competitorid": data.sa_competitorid,

utils/deleteMark.js

@@ -1,6 +1,6 @@
 /* 去除字符串中的特殊符号 */
 const queryStr = (str) => {
-    const pattern = new RegExp(/[`$%^&()\=<>"{}|\/;'\\[\]·￥%……&——\={}|]/g);
+    const pattern = new RegExp(/[`$%^&()\=<>"{}|\/;'\\[\]·￥%……&\={}|]/g);
     if (pattern.test(str) == true) wx.showToast({
         title: getApp().globalData.Language.getMapText('存在特殊符号') || '该符号不可输入!',
         icon: "none"