Selaa lähdekoodia

add:小黄车跳转商城小程序

ct 1 kuukausi sitten
vanhempi
commit
da24f80a61

+ 20 - 6
src/views/components/course/userCourseCatalogDetails.vue

@@ -716,18 +716,32 @@ export default {
 
     //选择疗法
     selectPackage(row) {
+      const type = row.packageCateType;
       const drug = {};
       for (var i = 0; i < this.packageList.length; i++) {
-        if (this.packageList[i].packageId == row.packageId) {
+        if (this.packageList[i].packageId === row.packageId && (type === null  || type === this.packageList[i].type)) {
           this.$message.warning("疗法已存在!")
           return;
         }
       }
-      drug.packageId = row.packageId;
-      drug.packageName = row.packageName;
-      drug.secondName = row.secondName;
-      drug.totalPrice = row.totalPrice;
-      drug.imgUrl = row.imgUrl;
+
+      if (type !== undefined && type !== null && type === "3") {
+        drug.type = type; //商城
+        drug.packageId = row.packageId;
+        drug.packageName = row.packageName;
+        drug.secondName = row.secondName;
+        drug.totalPrice = row.totalPrice;
+        drug.packageName = row.title;
+        drug.secondName = row.title;
+        drug.totalPrice = row.payMoney;
+        drug.imgUrl = row.imgUrl;
+      } else {
+        drug.packageId = row.packageId;
+        drug.packageName = row.packageName;
+        drug.secondName = row.secondName;
+        drug.totalPrice = row.totalPrice;
+        drug.imgUrl = row.imgUrl;
+      }
       this.packageList.push(drug);
       this.$message({
         message: '添加成功',

+ 20 - 2
src/views/components/his/packageSelect.vue

@@ -15,15 +15,20 @@
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
       </el-form-item>
     </el-form>
+    <el-tabs type="card" v-model="packageCateType" @tab-click="handleClickX">
+      <el-tab-pane label="公域" name="1"></el-tab-pane>
+      <el-tab-pane label="私域" name="2"></el-tab-pane>
+      <el-tab-pane label="商城" name="3"></el-tab-pane>
+    </el-tabs>
     <el-table height="600" v-loading="loading" border :data="list" >
       <el-table-column label="ID" align="center" prop="packageId" />
-      <el-table-column label="套餐包名称" align="center" prop="packageName" />
+      <el-table-column label="套餐包名称" align="center" :prop="packageCateType === '3' ? 'title' : 'packageName'" />
       <el-table-column label="疗法图片" align="center" prop="imgUrl">
         <template slot-scope="scope">
             <img :src="scope.row.imgUrl" style="height: 80px;">
         </template>
       </el-table-column>
-      <el-table-column label="别名" align="center" prop="secondName" />
+      <el-table-column label="别名" align="center" prop="secondName" :prop="packageCateType === '3' ? 'title' : 'packageName'"/>
       <el-table-column label="类型" align="center" prop="packageType">
         <template slot-scope="scope">
           <dict-tag :options="packageTypeOptions" :value="scope.row.packageType"/>
@@ -64,6 +69,7 @@ export default {
   name: "selectPackage",
   data() {
     return {
+      packageCateType:"1",
       loading: true,
       list:[],
       packageTypeOptions:[],
@@ -89,7 +95,19 @@ export default {
     });
   },
   methods: {
+    handleClickX(tab, event) {
+      this.packageCateType = tab.name;
+      if(tab.name=="1" || tab.name == null){
+        this.queryParams.isShow=1;
+      } else if (tab.name=="2"){
+        this.queryParams.isShow=0;
+      }else if (tab.name=="3"){
+        this.queryParams.isShow=2;
+      }
+      this.handleQuery();
+    },
     handleSelect(row){
+      row.packageCateType = this.packageCateType;
       this.$emit('selectPackage',row);
     },
     /** 搜索按钮操作 */

+ 3 - 0
src/views/system/config/config.vue

@@ -480,6 +480,9 @@
           <el-form-item label="SECRET_KEY" v-if="form7.isIdVerification == 1" prop="SECRET_KEY">
               <el-input   v-model="form7.SECRET_KEY"  label="请输入SECRET_KEY"></el-input>
           </el-form-item>
+          <el-form-item label="跳转商城小程序" prop="jumpStoreAppId">
+            <el-input   v-model="form7.jumpStoreAppId"  label="请输入跳转商城小程序"></el-input>
+          </el-form-item>
           <div class="footer">
             <el-button type="primary" @click="submitForm7">提 交</el-button>
           </div>