1

.env.development

@@ -8,4 +8,4 @@ VITE_APP_ENV = 'development'
 VITE_APP_BASE_API = 'http://127.0.0.1:8085'
 
 # 静态资源文件url
-VITE_APP_RESOURCES_URL = 'https://img.mall4j.com/'
+VITE_APP_RESOURCES_URL = 'https://img.ruixininfo.com/'

.env.production

@@ -5,7 +5,7 @@
 VITE_APP_ENV = 'production'
 
 # api接口请求地址
-VITE_APP_BASE_API = 'http://127.0.0.1:8085'
+VITE_APP_BASE_API = 'https://admin.ruixininfo.com'
 
 # 静态资源文件url
 VITE_APP_RESOURCES_URL = 'https://img.mall4j.com/'

.env.testing

@@ -5,7 +5,7 @@
 VITE_APP_ENV = 'testing'
 
 # api接口请求地址
-VITE_APP_BASE_API = 'http://127.0.0.1:8085'
+VITE_APP_BASE_API = 'https://admin.ruixininfo.com'
 
 # 静态资源文件url
 VITE_APP_RESOURCES_URL = 'https://img.mall4j.com/'

src/crud/prod/prodList.js

@@ -55,5 +55,24 @@ export const tableOption = {
         value: 1
       }
     ]
+  }, {
+    width: 150,
+    label: '商品分区',
+    prop: 'productType',
+    search: true,
+    slot: true,
+    type: 'select',
+    dicData: [
+      {
+        label: '普通',
+        value: 0
+      }, {
+        label: '会员',
+        value: 1
+      }, {
+        label: '积分',
+        value: 2
+      }
+    ]
   }]
 }

src/layout/main-navbar.vue

@@ -15,7 +15,7 @@
           v-if="!sidebarFold"
           class="site-navbar-lg"
         >
-        金桐商户管理平台
+          金桐商户管理平台
 
         </span>
         <span
@@ -23,7 +23,7 @@
           class="site-navbar-mini"
           :style="fontCloseSize"
         >
-           金桐商户管理平台
+          金桐商户管理平台
         </span>
       </div>
       <!--右侧数据-->

src/views/common/home/index.vue

@@ -1,5 +1,7 @@
 <template>
-  <div class="mod-home" ><h1>欢迎</h1> </div>
+  <div class="mod-home">
+    <h1>欢迎</h1>
+  </div>
 </template>
 
 <style lang="scss" scoped>

src/views/modules/prod/prodList/index.vue

@@ -39,7 +39,26 @@
           未上架
         </el-tag>
       </template>
-
+      <template #productType="scope">
+        <el-tag
+          v-if="scope.row.productType === 0"
+          type="info"
+        >
+          普通
+        </el-tag>
+        <el-tag
+          v-if="scope.row.productType === 1"
+          type="warning"
+        >
+          会员
+        </el-tag>
+        <el-tag
+          v-if="scope.row.productType === 2"
+          type="success"
+        >
+          积分
+        </el-tag>
+      </template>
       <template #menu="scope">
         <el-button
           v-if="isAuth('prod:prod:update')"
@@ -57,6 +76,22 @@
         >
           删除
         </el-button>
+        <el-button
+          v-if="isAuth('pord:pord:upmember')"
+          type="danger"
+          icon="el-icon-delete"
+          @click="onDelete(scope.row.prodId)"
+        >
+          上架到会员专区
+        </el-button>
+        <el-button
+          v-if="isAuth('pord:pord:upscore')"
+          type="danger"
+          icon="el-icon-delete"
+          @click="onDelete(scope.row.prodId)"
+        >
+          上架到积分专区
+        </el-button>
       </template>
     </avue-crud>
   </div>

src/views/modules/shop/shopInfo/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="mod-prod-info">
-   123123
+    123123
   </div>
 </template>
 

src/views/modules/shop/shopList/index.vue

@@ -11,7 +11,7 @@
       @on-load="getDataList"
     >
       <template #menu-left>
-<!--        <el-button
+        <!--        <el-button
           v-if="isAuth('shop:pickAddr:save')"
           type="primary"
           icon="el-icon-plus"
@@ -45,7 +45,7 @@
         >
           下架
         </el-button>
-<!--     <el-button
+        <!--     <el-button
           v-if="isAuth('shop:pickAddr:update')"
           type="primary"
           icon="el-icon-edit"
@@ -65,7 +65,6 @@
       </template>
     </avue-crud>
     <!-- 弹窗, 新增 / 修改 -->
-
   </div>
 </template>
 

src/views/modules/user/userPorefolio/index.vue

@@ -14,7 +14,7 @@
           v-if="scope.row.pic"
           class="avue-crud__img"
         >
-          <el-icon><Document/></el-icon>
+          <el-icon><Document /></el-icon>
         </span>
         <span v-else>-</span>
       </template>
@@ -26,10 +26,16 @@
         >
           待审核
         </el-tag>
-        <el-tag v-if="scope.row.portfolioStatus === 1" type="success">
+        <el-tag
+          v-if="scope.row.portfolioStatus === 1"
+          type="success"
+        >
           审核通过
         </el-tag>
-        <el-tag v-if="scope.row.portfolioStatus === -1" type="danger">
+        <el-tag
+          v-if="scope.row.portfolioStatus === -1"
+          type="danger"
+        >
           审核未通过
         </el-tag>
       </template>