Merge branch 'dev' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into gh

.env.production

@@ -3,13 +3,13 @@ ENV = 'production'
 # 如果使用 Nginx 代理后端接口，那么此处需要改为 '/'，文件查看 Docker 部署篇，Nginx 配置
 # 接口地址，注意协议，如果你没有配置 ssl，需要将 https 改为 http
 # 测试
-# VUE_APP_BASE_API  = 'https://admintestpapi.sxczgkj.cn'
+VUE_APP_BASE_API  = 'https://admintestpapi.sxczgkj.cn'
 
 # 生产
 # VUE_APP_BASE_API  = 'https://cashieradmin.sxczgkj.cn'
 
 # 预发布接口
-VUE_APP_BASE_API  = 'https://pre-cashieradmin.sxczgkj.cn'
+# VUE_APP_BASE_API  = 'https://pre-cashieradmin.sxczgkj.cn'
 
 # VUE_APP_BASE_API  = 'http://192.168.2.98:8000'
 # 如果接口是 http 形式， wss 需要改为 ws

src/views/application/index.vue

@@ -22,7 +22,7 @@
             </div>
         </div>
         <!-- 弹窗 -->
-        <el-dialog :title="title" :visible.sync="dialogVisible" width="30%" :before-close="handleClose">
+        <el-dialog :title="title" :visible.sync="dialogVisible" width="30%" >
             <el-form :model="forms">
                 <el-form-item label="账号：" label-width="60px">
                     <el-input v-model="forms.account" :disabled="title != '绑定数点票账号'" autocomplete="off"></el-input>
@@ -72,9 +72,6 @@ export default {
     methods: {
         upPop() {
             this.dialogVisible = true
-        },
-        handleClose() {
-
         },
         sumbitEvent() {
             if (this.forms.account) {

src/views/marketing/index.vue

@@ -20,7 +20,7 @@ import { appCenterGet } from "@/api/application";
 export default {
     data() {
         return {
-            list: []
+            list: [],
         }
     },
     mounted() {
@@ -30,7 +30,6 @@ export default {
         // 跳转
         to(item) {
             localStorage.setItem('applocation', JSON.stringify(item))
-            console.log(item,'调试 21')
             this.$router.push({
                 name: item.absUrl
             })
@@ -39,13 +38,15 @@ export default {
         async appCenterGet() {
             try {
                 const res = await appCenterGet({
-                    type:"market"
+                    type:'market'
                 })
                 this.list = res
             } catch (error) {
                 console.log(error);
             }
-        }
+        },
+
+
     }
 }
 </script>

src/views/product/index.vue

@@ -189,11 +189,13 @@
               style="margin-left: 20px !important;">
               <el-button type="text" icon="el-icon-edit">编辑</el-button>
             </router-link> -->
-            <el-button type="text" icon="el-icon-edit" @click="toPath('/product/add_shop', scope.row)">编辑</el-button>
+            <div style="display: flex;gap: 10px;">
-            <el-popconfirm title="确定删除吗？" @confirm="delTableHandle([scope.row.id])">
+              <el-button type="text" icon="el-icon-edit" @click="toPath('/product/add_shop', scope.row)"
-              <el-button type="text" icon="el-icon-delete" style="margin-left: 20px !important;"
+                v-if="scope.row.typeEnum">编辑</el-button>
-                slot="reference">删除</el-button>
+              <el-popconfirm title="确定删除吗？" @confirm="delTableHandle([scope.row.id])">
-            </el-popconfirm>
+                <el-button type="text" icon="el-icon-delete" slot="reference">删除</el-button>
+              </el-popconfirm>
+            </div>
           </template>
         </el-table-column>
       </el-table>
@@ -244,7 +246,7 @@ import { tbProductListV2, tbShopCategoryGet, tbProductDelete, tbProductIsHot, up
 import { hasPermission } from '@/utils/limits.js'
 
 export default {
-  name:'product',
+  name: 'product',
   components: {
     BindCons,
     StockHistory