Merge branch 'pre-release' of...

Merge branch 'pre-release' of http://110.41.143.128:8081/lanbaoming/jiedao-app-operator-master into yujinyao

src/views/ecw/memberManagement/addIntegrationRuleOperation/index.vue

@@ -99,11 +99,12 @@
       </el-form-item>
 
       <!-- 链接 -->
-      <el-form-item :label="$t('活动链接')" v-if="queryParams.type == '4'">
+      <el-form-item :label="$t('活动链接')" v-if="queryParams.type == '4'" >
         <el-input
           v-model="queryParams.extraShare.activityUrl"
           :placeholder="$t('请输入活动链接')"
           clearable
+          :disabled="true"
           onkeyup="this.value=this.value.replace(/(^\s*)|(\s*$)/g,'')"
         />
       </el-form-item>
@@ -996,9 +997,11 @@ export default {
     } else {
       this.handleGetRegionTreeList();
     }
+    this.queryParams.extraShare.activityUrl = process.env.NODE_ENV == 'production' ?'https://app2.groupage.cn/#/pages/activityShare/index':"https://apptest.groupage.cn/#/pages/activityShare/index"
   },
   activated() {},
   methods: {
+    //process.env.NODE_ENV
     //预览活动详情
     viewActivityDesc(val) {
       this.viewActivityDialog = true;
@@ -1139,7 +1142,7 @@ export default {
             this.queryParams.extraRegister.registerPlatform?.join();
           params.status = this.queryParams.status || "2";
           if (
-            (this.queryParams.type =
+            (this.queryParams.type ==
               1 && this.queryParams.extraOrderV.receiveAddrList[0][0] == "000")
           ) {
             params.extraOrderV.receiveAddrList = [[0, 0, 0]];
@@ -1166,7 +1169,7 @@ export default {
             this.queryParams.extraRegister.registerPlatform?.join();
           params.status = this.queryParams.status || "1";
           if (
-            (this.queryParams.type =
+            (this.queryParams.type ==
               1 && this.queryParams.extraOrderV.receiveAddrList[0][0] == "000")
           ) {
             params.extraOrderV.receiveAddrList = [[0, 0, 0]];