修改第三方小程序

linktools.vue

@@ -39,7 +39,7 @@ components: {
       <!-- 链接类型 -->
       <div class="links-types">
         <label class="types-title">链接类型</label>
-        <el-select v-model="linksType" placeholder="请选择" @change="linksTypeChange">
+        <el-select v-model="linksType" class="w200" placeholder="请选择" @change="linksTypeChange">
           <el-option
             v-for="item in linksTypeOptions"
             :key="item.value"
@@ -48,7 +48,7 @@ components: {
           </el-option>
         </el-select>
         <!-- 二级下拉 -->
-        <el-select v-model="twoLevelValue" placeholder="请选择" v-if="twoLevelVisible" @change="twoLevelValueChange">
+        <el-select v-model="twoLevelValue" class="w200"  placeholder="请选择" v-if="twoLevelVisible" @change="twoLevelValueChange">
           <el-option
             v-for="item in twoLevelOptions"
             :key="item.value"
@@ -57,7 +57,7 @@ components: {
           </el-option>
         </el-select>
         <!-- 三级下拉 -->
-        <div class="three-level-wrap" v-if="threeLevelVisible">
+        <div class="three-level-wrap w200" v-if="threeLevelVisible">
           <!-- 三级单选 -->
           <el-select v-model="threeLevelValue" placeholder="请选择" v-if="threeLeveloneVisible" @change="threeSingleValueChange">
             <el-option
@@ -105,7 +105,7 @@ components: {
       <div class="h5link-contain" v-if="h5linkVisible">
         <div class="h5link-row">
           <label class="h5link-title">进入条件</label>
-          <el-select class="conditionType-select" v-model="h5linkObj.conditionType"  placeholder="请选择进入条件">
+          <el-select class="conditionType-select w200" v-model="h5linkObj.conditionType"  placeholder="请选择进入条件">
             <el-option
               v-for="item in h5linkObj.conditionTypeOptions"
               :key="item.value"
@@ -208,14 +208,14 @@ components: {
 
       <!-- 第三方小程序 -->
       <div class="h5link-contain" v-if="thirdlinkVisible">
-        <div class="h5link-row">
+        <!-- <div class="h5link-row">
           <label class="h5link-title">名称</label>
           <el-input v-model="thirdObj.name" placeholder="请输入名称"></el-input>
         </div>
         <div class="h5link-row">
           <label class="h5link-title">appid</label>
           <el-input v-model="thirdObj.appid" placeholder="请输入 appid"></el-input>
-        </div>
+        </div> -->
         <div class="h5link-row">
           <label class="h5link-title h5link-dynamic-title">动态参数</label>
           <div class="h5-table">
@@ -662,7 +662,7 @@ export default {
       that.threeLevelSelectValue = '';
 
       // 如果是 h5,二级,三级隐藏,
-      var type = selectOneItem.type == 5 || selectOneItem.type == 7? true:false;
+      var type = selectOneItem.type == 5 ? true:false;
       that.setOneLevelVisible(type,selectOneItem)
     },
 
@@ -705,8 +705,13 @@ export default {
           that.getDefinePage();
           console.log(that.selectLinkObj)
           return false;
+        } else if (selectOneItem.type == 7){
+          console.log('第三方小程序第三方小程序第三方小程序第三方小程序')
+          that.h5linkVisible = false;  // h5 链接参数输入部分显示
+          that.thirdlinkVisible = true; // 第三方小程序
+          that.threeLevelVisible = false; // 三级部分隐藏
+          this.getAppList();
         }
-
         // 清空设置选择的 id
         that.selectLinkObj.id = '';
         console.log("一级选择obj:",that.selectLinkObj)
@@ -754,7 +759,7 @@ export default {
 
       console.log("二级选择的 obj: ",that.selectLinkObj.id)
       // 判断是否结束, 1:结束;
-      if (selectTwoItem.type == 1 || selectTwoItem.type == 4 || selectTwoItem.type == 6) {
+      if (selectTwoItem.type == 1 || selectTwoItem.type == 4 || selectTwoItem.type == 6 || that.oneLevelTypeValue == 7) {
         that.threeLevelVisible = false; // 三级部分隐藏
         that.threeLevelValue = ''; // 清空三级数据
         that.twoLevelSelectValue = ''; // 清空门店签到
@@ -1056,6 +1061,38 @@ export default {
       });
     },
 
+        // 查询第三方小程序列表
+    getAppList() {
+      this.axios.post(this.baseUrl+'/api-plug/applet-app-search?requestProject=gic-web')
+      .then((res) => {
+        var resData = res.data;
+        let list = [];
+        if (resData.errorCode == 0) {
+          resData.result.forEach(v => {
+            if (v.appStatus === 1) {
+              list.push({
+                id:v.appId,
+                label:v.appName,
+                value:v.appletAppId
+              })
+            }
+          })
+          this.twoLevelOptions = list;
+        } else {
+          this.$message.error({
+            duration: 1000,
+            message: error.message
+          })
+        }
+      })
+      .catch( error => {
+        this.$message.error({
+          duration: 1000,
+          message: error.message
+        })
+      });
+    },
+
     // --------------------------------------------------
 
 
@@ -1385,16 +1422,18 @@ export default {
 
       // 如果是第三方小程序
       if (that.oneLevelTypeValue == 7) {
-        if (!that.thirdObj.name.trim() || !that.thirdObj.appid.trim()) {
+        if (!this.twoLevelValue) {
           that.$message.error({
             duration: 1000,
-            message: "请填写链接内容"
+            message: "请选择第三方小程序"
           })
-          return;
         }
-
-        that.selectLinkObj.name = that.thirdObj.name;
-        that.selectLinkObj.appid = that.thirdObj.appid;//
+        this.twoLevelOptions.forEach(v => {
+          if (v.value === this.twoLevelValue) {
+            that.selectLinkObj.name = v.label;
+            that.selectLinkObj.appid = v.value;//
+          }
+        })
         that.selectLinkObj.params = ''
         if (!!that.dynamicList.length) {
           let thirdDataList = JSON.parse(JSON.stringify(that.dynamicList))
@@ -1829,6 +1868,9 @@ export default {
 
 
 <style lang="scss" scoped>
+  .w200 {
+    width:200px;
+  }
 
   .el-tab-pane {
     min-height: 200px;
@@ -1943,10 +1985,11 @@ export default {
 
     .types-title {
       display: inline-block;
-      width: 80px;
+      width: 72px;
       text-align: right;
       font-size: 14px;
       padding-right: 10px;
+      vertical-align: middle;
     }
 
     .el-select+.el-select {

linktoolspage.vue

-<!--
-/**
- * 链接小工具组件(页面内) by fairyly on 2018/06/15
- * 组件调用
- */
-<linktoolspage :showType="showType" :linkToolsVisible="linkToolsVisible" @linkSelect="linkSelect"/>
-
-import Linktoolspage from 'components/linktools/linktoolspage.vue'
-
-// 链接小工具参数
-linkToolsVisible: false, //显示参数
-showType: 0, // 显示类型,插件默认 0:显示全部 ,1: (底部导航);2: (公众号菜单:只有小程序的,没有h5)
-
-// methods
-// linktools
-showLinkDialog() {
-  this.linkToolsVisible = true;
-},
-
-linkSelect(val) {
-  console.log(val)
-  // 关闭时隐藏
-  this.linkToolsVisible = false;
-}
 
-components: {
-  Linktools
-}
-
- -->
 <template>
   <!-- 链接小工具 -->
   <div class="link-tools-contain">
@@ -37,7 +8,7 @@ components: {
           <!-- 链接类型 -->
           <div class="links-types">
             <label class="types-title">链接类型</label>
-            <el-select v-model="linksType" placeholder="请选择" @change="linksTypeChange">
+            <el-select v-model="linksType" class="w200" placeholder="请选择" @change="linksTypeChange">
               <el-option
                 v-for="item in linksTypeOptions"
                 :key="item.value"
@@ -46,7 +17,7 @@ components: {
               </el-option>
             </el-select>
             <!-- 二级下拉 -->
-            <el-select v-model="twoLevelValue" placeholder="请选择" v-if="twoLevelVisible" @change="twoLevelValueChange">
+            <el-select v-model="twoLevelValue" class="w200" placeholder="请选择" v-if="twoLevelVisible" @change="twoLevelValueChange">
               <el-option
                 v-for="item in twoLevelOptions"
                 :key="item.value"
@@ -57,7 +28,7 @@ components: {
             <!-- 三级下拉 -->
             <div class="three-level-wrap"  v-if="threeLevelVisible">
               <!-- 三级单选 -->
-              <el-select v-model="threeLevelValue" placeholder="请选择" v-if="threeLeveloneVisible" @change="threeSingleValueChange">
+              <el-select class="w200" v-model="threeLevelValue" placeholder="请选择" v-if="threeLeveloneVisible" @change="threeSingleValueChange">
                 <el-option
                   v-for="item in threeLevelOptions"
                   :key="item.value"
@@ -88,6 +59,7 @@ components: {
                 placeholder="请输入关键词"
                 :remote-method="remoteMethod"
                 @change="threeLevelValueChange"
+                class="w200"
                 >
                 <el-option
                   v-for="item in threeLevelOptions"
@@ -103,7 +75,7 @@ components: {
       <div class="h5link-contain" v-if="h5linkVisible">
         <div class="h5link-row">
           <label class="h5link-title">进入条件</label>
-          <el-select class="conditionType-select" v-model="h5linkObj.conditionType"  placeholder="请选择进入条件">
+          <el-select class="conditionType-select w200" v-model="h5linkObj.conditionType"  placeholder="请选择进入条件">
             <el-option
               v-for="item in h5linkObj.conditionTypeOptions"
               :key="item.value"
@@ -147,7 +119,7 @@ components: {
               <tbody>
                 <tr>
                   <td>
-                    <el-select size="small" class="dynamic-param-select" v-model="dynamicRow.key" placeholder="请选择参数" @change="dynamicChange($event)">
+                    <el-select size="small" class="dynamic-param-select w200" v-model="dynamicRow.key" placeholder="请选择参数" @change="dynamicChange($event)">
                       <el-option
                       v-for="item in h5linkObj.dynamicParaOptions"
                       :key="item.value"
@@ -166,7 +138,7 @@ components: {
                     <td>
                       <template v-if="!dynamicItem.editAble">{{dynamicItem.key}}</template>
                       <template v-if="dynamicItem.editAble">
-                        <el-select size="small" class="dynamic-param-select" v-model="dynamicItem.selectKey" placeholder="请选择参数">
+                        <el-select size="small" class="dynamic-param-select w200" v-model="dynamicItem.selectKey" placeholder="请选择参数">
                           <el-option
                           v-for="item in h5linkObj.dynamicParaOptions"
                           :key="item.value"
@@ -206,14 +178,14 @@ components: {
 
       <!-- 第三方小程序 -->
       <div class="h5link-contain" v-if="thirdlinkVisible">
-        <div class="h5link-row">
+        <!-- <div class="h5link-row">
           <label class="h5link-title">名称</label>
           <el-input v-model="thirdObj.name" placeholder="请输入名称"></el-input>
         </div>
         <div class="h5link-row">
           <label class="h5link-title">appid</label>
           <el-input v-model="thirdObj.appid" placeholder="请输入 appid"></el-input>
-        </div>
+        </div> -->
         <div class="h5link-row">
           <label class="h5link-title h5link-dynamic-title">动态参数</label>
           <div class="h5-table">
@@ -241,7 +213,7 @@ components: {
               <tbody>
                 <tr>
                   <td>
-                    <el-select size="small" class="dynamic-param-select" v-model="dynamicRow.key" placeholder="请选择参数" @change="dynamicChange($event)">
+                    <el-select size="small" class="dynamic-param-select w200" v-model="dynamicRow.key" placeholder="请选择参数" @change="dynamicChange($event)">
                       <el-option
                       v-for="item in h5linkObj.dynamicParaOptions"
                       :key="item.value"
@@ -260,7 +232,7 @@ components: {
                     <td>
                       <template v-if="!dynamicItem.editAble">{{dynamicItem.key}}</template>
                       <template v-if="dynamicItem.editAble">
-                        <el-select size="small" class="dynamic-param-select" v-model="dynamicItem.selectKey" placeholder="请选择参数">
+                        <el-select size="small" class="dynamic-param-select w200" v-model="dynamicItem.selectKey" placeholder="请选择参数">
                           <el-option
                           v-for="item in h5linkObj.dynamicParaOptions"
                           :key="item.value"
@@ -658,7 +630,7 @@ export default {
       that.threeLevelSelectValue = '';
 
       // 如果是 h5,二级,三级隐藏,
-      var type = selectOneItem.type == 5 || selectOneItem.type == 7? true:false;
+      var type = selectOneItem.type == 5 ? true:false;
       that.setOneLevelVisible(type,selectOneItem)
     },
 
@@ -673,10 +645,6 @@ export default {
           that.h5linkVisible = true;  // h5 链接参数输入部分显示
           that.thirdlinkVisible = false; // 第三方小程序
         }
-        if (selectOneItem.type ==7 ) {
-          that.h5linkVisible = false;  // h5 链接参数输入部分显示
-          that.thirdlinkVisible = true; // 第三方小程序
-        }
         that.twoLevelVisible = false; // 二级部分隐藏
         that.threeLevelVisible = false; // 三级部分隐藏
         that.goodsLinksVisible = false; // 商品链接列表部分
@@ -700,6 +668,12 @@ export default {
           that.getDefinePage();
           console.log(that.selectLinkObj)
           return false;
+        } else if (selectOneItem.type == 7){
+          console.log('第三方小程序第三方小程序第三方小程序第三方小程序')
+          that.h5linkVisible = false;  // h5 链接参数输入部分显示
+          that.thirdlinkVisible = true; // 第三方小程序
+          that.threeLevelVisible = false; // 三级部分隐藏
+          this.getAppList();
         }
 
         // 清空设置选择的 id
@@ -735,6 +709,11 @@ export default {
         console.log('二级选择是自定义:',that.twoLevelOptions,that.selectLinkObj)
         return;
       }
+
+      console.log(that.oneLevelTypeValue)
+
+
+
       var selectTwoItem = '';
       that.twoLevelOptions.forEach(function(ele,index){
         if (e == ele.linkId) {
@@ -747,9 +726,9 @@ export default {
       // 设置选择的 id
       that.selectLinkObj.id = e;
 
-      console.log("二级选择的 obj: ",that.selectLinkObj.id)
+      console.log("二级选择的 obj: ",selectTwoItem.type,that.selectLinkObj.id)
       // 判断是否结束, 1:结束;
-      if (selectTwoItem.type == 1 || selectTwoItem.type == 4 || selectTwoItem.type == 6) {
+      if (selectTwoItem.type == 1 || selectTwoItem.type == 4 || selectTwoItem.type == 6 || that.oneLevelTypeValue == 7 ) {
         that.threeLevelVisible = false; // 三级部分隐藏
         that.threeLevelValue = ''; // 清空三级数据
         that.twoLevelSelectValue = ''; // 清空门店签到
@@ -760,12 +739,9 @@ export default {
 
         // 如果选择商品链接
         if(selectTwoItem.type == 4){
-
           that.getGoodsList(); // 获取商品列表
           that.getGoodsCategory();// 获取商品品类
           that.getGoodsClassify(); // 获取商品分类
-
-
           that.threeLevelVisible = false; // 三级部分隐藏
           that.goodsLinksVisible = true; // 商品链接列表部分显示
           return false;
@@ -1051,6 +1027,39 @@ export default {
       });
     },
 
+    // 查询第三方小程序列表
+    getAppList() {
+      this.axios.post(this.baseUrl+'/api-plug/applet-app-search?requestProject=gic-web')
+      .then((res) => {
+        var resData = res.data;
+        let list = [];
+        if (resData.errorCode == 0) {
+          resData.result.forEach(v => {
+            if (v.appStatus === 1) {
+              list.push({
+                id:v.appId,
+                label:v.appName,
+                value:v.appletAppId
+              })
+            }
+          })
+          this.twoLevelOptions = list;
+        } else {
+          this.$message.error({
+            duration: 1000,
+            message: error.message
+          })
+        }
+      })
+      .catch( error => {
+        this.$message.error({
+          duration: 1000,
+          message: error.message
+        })
+      });
+    },
+
+
     // --------------------------------------------------
 
 
@@ -1375,16 +1384,18 @@ export default {
 
       // 如果是第三方小程序
       if (that.oneLevelTypeValue == 7) {
-        if (!that.thirdObj.name.trim() || !that.thirdObj.appid.trim()) {
+        if (!this.twoLevelValue) {
           that.$message.error({
             duration: 1000,
-            message: "请填写链接内容"
+            message: "请选择第三方小程序"
           })
-          return;
         }
-
-        that.selectLinkObj.name = that.thirdObj.name;
-        that.selectLinkObj.appid = that.thirdObj.appid;//
+        this.twoLevelOptions.forEach(v => {
+          if (v.value === this.twoLevelValue) {
+            that.selectLinkObj.name = v.label;
+            that.selectLinkObj.appid = v.value;//
+          }
+        })
         that.selectLinkObj.params = ''
         if (!!that.dynamicList.length) {
           let thirdDataList = JSON.parse(JSON.stringify(that.dynamicList))
@@ -1824,8 +1835,10 @@ export default {
 
   /************************************************/
 
-
   /* tab linktools*/
+  .w200 {
+    width:200px;
+  }
 
   .link-tools-contain /deep/ {
     .vue-treeselect-helper-zoom-effect-off {
@@ -2658,10 +2671,11 @@ export default {
 
       .types-title {
         display: inline-block;
-        width: 80px;
+        width: 72px;
         text-align: right;
         font-size: 14px;
-        padding-right: 12px;
+        padding-right: 10px;
+        vertical-align: middle;
       }
 
       .el-select+.el-select{