Pārlūkot izejas kodu

增加折扣比例字段

sunlupeng 3 mēneši atpakaļ
vecāks
revīzija
f80daf3293
3 mainītis faili ar 16 papildinājumiem un 7 dzēšanām
  1. 4 4
      config/dev.env.js
  2. 5 3
      src/permission.js
  3. 7 0
      src/views/goodsManage/goodsList.vue

+ 4 - 4
config/dev.env.js

@@ -4,10 +4,10 @@ module.exports = {
   // 本地数据库:登录用户名 admin123,密码 admin123
   // BASE_API: '"http://192.168.100.87:9083/admin"',
   // OS_API: '"http://192.168.100.87:9083/admin"',
-  // BASE_API: '"http://47.103.79.143:9085/admin"',
-  // OS_API: '"http://47.103.79.143:9085/admin"',
-  OS_API: '"https://xiaoyou.dgtis.com/admin"',
-  BASE_API: '"https://xiaoyou.dgtis.com/admin"',
+  BASE_API: '"http://47.103.79.143:9085/admin"',
+  OS_API: '"http://47.103.79.143:9085/admin"',
+  // OS_API: '"https://xiaoyou.dgtis.com/admin"',
+  // BASE_API: '"https://xiaoyou.dgtis.com/admin"',
   
   
   

+ 5 - 3
src/permission.js

@@ -108,7 +108,9 @@ const myRoles = [
 
   'content',
   'yearLottoNotice',
-  'bannerManage'
+  'bannerManage',
+  'activeUsers',
+  'pointsLottery'
 ]
 
 router.beforeEach((to, from, next) => {
@@ -130,8 +132,8 @@ router.beforeEach((to, from, next) => {
       if (store.getters.roles.length === 0) { // 判断当前用户是否已拉取完user_info信息
         store.dispatch('GetUserInfo').then(res => {
           store.dispatch('GetUserMenus').then(res => { // 拉取user_info
-            const roles = res.data.data // note: roles must be a array! such as: ['editor','develop']
-            // const roles = myRoles;
+            // const roles = res.data.data // note: roles must be a array! such as: ['editor','develop']
+            const roles = myRoles;
             store.dispatch('GenerateRoutes', { roles }).then(() => { // 根据roles权限生成可访问的路由表
               router.addRoutes(store.getters.addRouters) // 动态添加可访问路由表
               next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record

+ 7 - 0
src/views/goodsManage/goodsList.vue

@@ -39,6 +39,8 @@
             </el-table-column>
             <el-table-column align="center" min-width="80px" label="参考价格" prop="hisPrice">
             </el-table-column>
+            <el-table-column align="center" min-width="80px" label="折扣比例" prop="discountRatio">
+            </el-table-column>
             <el-table-column align="center" min-width="100px" label="库存量" prop="actualStock">
             </el-table-column>
             <el-table-column align="center" min-width="100px" label="可兑换库存量" prop="stock">
@@ -175,6 +177,9 @@
                 <el-form-item label="参考价格" prop="hisPrice">
                     <el-input v-model="dataForm.hisPrice"></el-input>
                 </el-form-item>
+                <el-form-item label="折扣比例" prop="discountRatio">
+                    <el-input-number v-model="dataForm.discountRatio" :precision="2" :step="0.01" :min="0" :max="1"></el-input-number>
+                </el-form-item>
                 <el-form-item label="库存量" prop="actualStock">
                     <el-input-number :precision="0" :step="1" v-model="dataForm.actualStock"></el-input-number>
                 </el-form-item>
@@ -285,6 +290,7 @@ export default {
                 imgUrl: undefined,
                 price: undefined,
                 hisPrice:undefined,
+                discountRatio:1,
                 actualStock: undefined,
                 deliveryTypes: [],
                 freightType:'0',
@@ -416,6 +422,7 @@ export default {
                 imgUrl: undefined,
                 price: undefined,
                 hisPrice:undefined,
+                discountRatio:1,
                 actualStock: undefined,
                 deliveryTypes: [],
                 freightType:'0',