贵大功能集成

src/api/appConfig.js

@@ -9,11 +9,15 @@
  * Copyright (c) 2023 by ${git_name_email}, All Rights Reserved. 
  */
 import request from '@/utils/request'
+import { isLocal } from '@/utils'
+
+//替换为开发服务名
+const service = isLocal() ? '/zswl-cloud-shop' : '/zswl-cloud-shop'
 
 // 菜单列表
 export function getMenu(params) {
   return request({
-    url: '/zswl-cloud-shop/menu/list',
+    url: service+'/menu/list',
     method: 'get',
     params
   })
@@ -85,7 +89,7 @@ export function addOrUpdateBanner(data) {
 // banner列表
 export function advList(params) {
   return request({
-    url: '/zswl-cloud-shop/advertsInfo/search',
+    url: service+'/advertsInfo/search',
     method: 'get',
     params
   })
@@ -103,7 +107,7 @@ export function delAdv(params) {
 // 新增、编辑banner
 export function addOrUpdateAdv(data) {
   return request({
-    url: '/zswl-cloud-shop/advertsInfo/addOrUpdate',
+    url: service+'/advertsInfo/addOrUpdate',
     method: 'post',
     data
   })

src/utils/index.js

@@ -174,4 +174,19 @@ export function setAes(pas,k) {
       padding: CryptoJS.pad.Pkcs7
   })
   return b.stringify(encrypted.ciphertext)
+}
+
+/**
+ * 根据window.location判断是否是本地环境
+ * @returns Boolean
+ */
+export function isLocal() {
+   // 获取当前 URL 的主机部分
+   const hostname = new URL(window.location.href).hostname;
+
+   // 匹配本地地址
+   const cBlockRegex = /^(localhost|127.0.0.1|192\.168\.|10\.|172\.(1[6-9]|2[0-9]|3[0-1])\.)/;
+ 
+   // 检查当前 URL 的主机部分是否匹配 C 段网络
+   return cBlockRegex.test(hostname);
 }

src/views/operationManage/advertisingManage/addAdv.vue

@@ -39,6 +39,22 @@
           >
           </el-option>
         </el-select>
+      </el-form-item>
+      <el-form-item label="小程序：" prop="belongType">
+        <el-select
+          v-model="setQuery.belongType"
+          clearable
+          class="item-width-200"
+          placeholder="请选择小程序"
+        >
+          <el-option
+            v-for="item in belongTypeOptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          >
+          </el-option>
+        </el-select>
       </el-form-item>
         <el-form-item label="跳转链接：" prop="jumpUrl">
         <el-input
@@ -69,7 +85,7 @@
     </el-form>
 
     <div class="btn-group">
-       <el-button>取 消</el-button>
+       <el-button @click="cancel">取 消</el-button>
      <el-button type="primary" :loading="loading"  @click="save">确 定</el-button>
     </div>
   </div>
@@ -78,6 +94,7 @@
 <script>
 import Upload from '@/components/Upload'
 import {addOrUpdateAdv} from '@/api/appConfig'
+import { cancel } from 'ali-oss/lib/common/parallel';
 export default {
     components: {
         Upload,
@@ -93,7 +110,8 @@ export default {
           "menuId": '',
           "sort": 0,
           "showSort":0,
-          "status":1
+          "status":1,
+          "belongType":2
         },
       options:[
         {
@@ -104,7 +122,17 @@ export default {
           label:'首页广告位',
           value:2
         }
-      ]
+      ],
+      belongTypeOptions:[
+        { 
+          label: "贵大",
+          value: '1',
+        },
+        {
+          label: "慧研学",
+          value: '2',
+        },
+      ],
     };
   },
   computed: {
@@ -112,6 +140,7 @@ export default {
         return {
         advertsImg: [{ required: true, message: "请上传广告图", trigger: "change" }],
         advertsType: [{ required: true, message: "请选择广告类型", trigger: "change" }],
+        belongType: [{ required: true, message: "请选择小程序", trigger: "change" }],
         advertsName: [{ required: true, message: "请输入广告名称", trigger: "blur" }],
         jumpUrl: [{ required: true, message: "请输入调整链接", trigger: "blur" }],
         sort: [{ required: true, message: "请输入排序权重", trigger: "blur" }],
@@ -123,6 +152,9 @@ export default {
     uploadEnd(val){
       this.setQuery.advertsImg = val.url
     },
+    cancel(){
+      this.$router.push('/operationManage/advertisingManage/index')
+    },
    save() {
       this.$refs.setQuery.validate((v) => {
         if (v) {

src/views/operationManage/advertisingManage/index.vue

@@ -58,6 +58,15 @@
           <img class="icon" :src="scope.row.advertsImg" alt="">
         </template>
       </el-table-column>
+      <el-table-column
+        align="center"
+        label="小程序"
+        show-overflow-tooltip
+      >
+       <template slot-scope="scope">
+          <span>{{scope.row.belongType ==2?'慧研学':'贵大'}}</span>
+        </template>
+      </el-table-column>
       <el-table-column
         prop="jumpUrl"
         align="center"

src/views/operationManage/appMenuManage/addMenu.vue

@@ -13,6 +13,24 @@
         ></el-input>
       </el-form-item>
 
+      <el-form-item label="小程序：" prop="belongType">
+        <el-select
+          v-model="setQuery.belongType"
+          clearable
+          class="item-width-200"
+          placeholder="请选择小程序"
+        >
+          <el-option
+            v-for="item in belongTypeOptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          >
+          </el-option>
+        </el-select>
+      </el-form-item>
+
+
        <el-form-item label="菜单上方文字：">
         <el-input
           v-model="setQuery.labelAbove"
@@ -62,7 +80,7 @@
     </el-form>
 
     <div class="btn-group">
-       <el-button>取 消</el-button>
+       <el-button @click="cancel">取 消</el-button>
      <el-button type="primary" :loading="loading"  @click="save">确 定</el-button>
     </div>
   </div>
@@ -93,11 +111,23 @@ export default {
         "note": "",
         "secondaryImg": "",
         "sort": 0,
-        "status": 0
+        "status": 0,
+        "belongType":'2'
       },
+      belongTypeOptions:[
+        { 
+          label: "贵大",
+          value: '1',
+        },
+        {
+          label: "慧研学",
+          value: '2',
+        },
+      ],
       rules: {
         menuName: [{ required: true, message: "请输入菜单名称", trigger: "blur" }],
         domainUrl: [{ required: true, message: "请输入链接地址", trigger: "blur" }],
+        belongType: [{ required: true, message: "请选择小程序", trigger: "change" }],
         imgUrl: [{ required: true, message: "请输入图标", trigger: "blur" }],
         sort: [{ required: true, message: "请输入权重", trigger: "blur" }],
         secondaryImg: [{ required: true, message: "请上传分类顶部图", trigger: "change" }],
@@ -108,6 +138,9 @@ export default {
     uploadEnd(val){
       this.setQuery[val.type] = val.url
     },
+    cancel(){
+      this.$router.push('/operationManage/appMenuManage/index')
+    },
     save() {
       this.$refs.setQuery.validate((v) => {
         if (v) {

src/views/operationManage/appMenuManage/index.vue

@@ -2,7 +2,32 @@
 <template>
   <div class="appMenuManage app-container">
     <div class="search">
-      
+      <div>
+        <el-select
+          v-model="query.belongType"
+          size="small"
+          clearable
+          class="item-width-200"
+          placeholder="请选择小程序类型"
+        >
+          <el-option
+            v-for="item in options"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          >
+          </el-option>
+        </el-select>
+        <el-button
+        class="ml10"
+        type="primary"
+        size="small"
+        icon="el-icon-search"
+        @click="handleSearch"
+      >
+        搜索
+      </el-button>
+      </div>
       <el-button class="add-btn" type="primary" size="small" @click="handleAdd"
         >添加</el-button
       >
@@ -33,6 +58,15 @@
         show-overflow-tooltip
       >
       </el-table-column>
+      <el-table-column
+        align="center"
+        label="小程序"
+        show-overflow-tooltip
+      >
+       <template slot-scope="scope">
+          <span>{{scope.row.belongType ==2?'慧研学':'贵大'}}</span>
+        </template>
+      </el-table-column>
       <el-table-column
         prop="sort"
         align="center"
@@ -96,9 +130,20 @@ export default {
         status: "",
         menuName: "",
         parentId:'',
+        belongType:null,
         currentPage: 1,
         pageSize: 10,
       },
+      options:[
+        {
+          label:'贵大',
+          value:'1'
+        },
+        {
+          label:'慧研学',
+          value:'2'
+        }
+      ],
       title: "",
       total: 0,
     };
@@ -112,6 +157,11 @@ export default {
     },
   },
   methods: {
+    handleSearch(){
+      this.query.currentPage = 1
+      this.advList();
+
+    },
     handle(id){
       let title
       if(!this.$route.query.title){

src/views/studyManage/menuManage/addMenu.vue

@@ -29,6 +29,22 @@
           class="item-width-300"
         ></el-input>
       </el-form-item>
+      <el-form-item label="小程序：" prop="belongType">
+        <el-select
+          v-model="setQuery.belongType"
+          clearable
+          class="item-width-200"
+          placeholder="请选择小程序"
+        >
+          <el-option
+            v-for="item in belongTypeOptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          >
+          </el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item label="蒙层颜色：" v-if="setQuery.templateType == 2&&$route.query.level == '三级栏目'" prop="colour">
         <el-input
           v-model.number="setQuery.colour"
@@ -107,7 +123,7 @@
     </el-form>
 
     <div class="btn-group">
-       <el-button>取 消</el-button>
+       <el-button @click="cancel">取 消</el-button>
      <el-button type="primary" :loading="loading"  @click="save">确 定</el-button>
     </div>
   </div>
@@ -137,6 +153,16 @@ export default {
         ],
         options1:[],
         typeOptions:[],
+        belongTypeOptions:[
+        { 
+          label: "贵大",
+          value: '1',
+        },
+        {
+          label: "慧研学",
+          value: '2',
+        },
+      ],
       setQuery: {
         "columnImg": "",
         "secondaryImg":'',
@@ -149,11 +175,13 @@ export default {
         "status": 1,
         "templateType": 1,
         "goodsCateId":'',
+        "belongType":'2'
         },
       rules: {
         columnImg: [{ required: true, message: "请上传栏目封面", trigger: "change" }],
         secondaryImg: [{ required: true, message: "请上传下级顶部图", trigger: "change" }],
         columnName: [{ required: true, message: "请输入栏目名称", trigger: "blur" }],
+        belongType: [{ required: true, message: "选择小程序", trigger: "change" }],
         columnMsg: [{ required: true, message: "请输入栏目描述", trigger: "blur" }],
         sort: [{ required: true, message: "请输入权重", trigger: "blur" }],
         colour: [{ required: true, message: "请输入蒙层颜色", trigger: "blur" }],
@@ -170,6 +198,9 @@ export default {
             this.setQuery.parentId = 0
         }
     },
+    cancel(){
+      this.$router.push('/studyManage/menuManage/index')
+    },
     uploadEnd(val){
       this.setQuery[val.type] = val.url
     },

src/views/studyManage/menuManage/index.vue

@@ -72,6 +72,15 @@
         show-overflow-tooltip
       >
       </el-table-column>
+      <el-table-column
+        align="center"
+        label="小程序"
+        show-overflow-tooltip
+      >
+       <template slot-scope="scope">
+          <span>{{scope.row.belongType ==2?'慧研学':'贵大'}}</span>
+        </template>
+      </el-table-column>
       <el-table-column
         prop="sort"
         align="center"

vue.config.js

@@ -45,13 +45,13 @@ module.exports = {
     },
     //	反向代理
     proxy: {
-      // '^/api/admin': {
-      //   target: 'https://api.dev.zonelife.cn/zswl-cloud-shop/',//代理
-      //   changeOrigin: true,//是否跨域
-      //   pathRewrite: {
-      //     '^/api/admin': ''
-      //   }
-      // },
+      '^/api/zswl-cloud-shop': {
+        target: 'http://g3710170f8.zicp.fun/',//代理
+        changeOrigin: true,//是否跨域
+        pathRewrite: {
+          '^/api/zswl-cloud-shop': ''
+        }
+      },
       '^/api': {
         // target: 'http://192.168.110.153:9002/',//代理
         target: url.BASE_URL,//代理