Merge branch 'linwenxin_dev' into pengyouhao_dev

.env.production

@@ -1,17 +1,16 @@
 NODE_ENV = production
-
-# just a flag
 ENV = 'production'
 VUE_APP_ENV = 'production'
-
-#base
 VUE_APP_BASE = 'https://sxb.zfire.top'
-
 VUE_APP_BASE_OSS = 'https://zf-mall.oss-cn-shenzhen.aliyuncs.com/'
-
-# base api
 VUE_APP_BASE_API = 'https://sxb.zfire.top/zfapi/'
 
-# appid agentid
-VUE_APP_PUBLIC_APPID = 'ww62ea04d5c904dc4a'
-VUE_APP_PUBLIC_AGENTID = '1000018'
+
+# # 独立部署配置
+# NODE_ENV = production
+# ENV = 'production'
+# VUE_APP_ENV = 'production'
+# VUE_APP_BASE = 'https://jxgree.zfire.top'
+# VUE_APP_BASE_OSS = 'https://zf-mall-jx.oss-cn-shenzhen.aliyuncs.com/'
+# VUE_APP_BASE_API = 'https://jxgree.zfire.top/zfapi/'
+

src/views/mallManagement/setActivity/index.vue

@@ -133,7 +133,7 @@ export default {
         {
           name: 'el-input',
           md: 12,
-          attributes: { disabled: !!this.formData.id, placeholder: '请选择' },
+          attributes: { disabled: !!this.formData.id, placeholder: '请选择', maxlength:8 },
           formItemAttributes: { 
             label: '二维码主题', 
             prop: 'title',
@@ -497,9 +497,10 @@ export default {
           click: ({ row, index, column }) => {
             this.$router.push({
               name: "activityOrder",
-              query: {
-                type: "detail",
-                id: row.id,
+              params: {
+                pageName: row.id,
+                pageType: 'detail',
+                pageCode: row.id,
               },
             })
           }
@@ -508,9 +509,10 @@ export default {
           click: ({ row, index, column }) => {
             this.$router.push({
               name: "activityOrder",
-              query: {
-                type: "list",
-                id: row.id,
+              params: {
+                pageName: row.id,
+                pageType: 'list',
+                pageCode: row.id,
               },
             })
           }