Browse Source

修改价格

wangningfei 2 years ago
parent
commit
ac876835de

+ 2 - 2
vue-admin-template-master/.env.development

@@ -2,5 +2,5 @@
 ENV = 'development'
 
 # base api
-VUE_APP_BASE_API = 'https://hw.cirray.cn/api/'
-# VUE_APP_BASE_API = 'https://talk.cirray.cn/api/'
+# VUE_APP_BASE_API = 'https://hw.cirray.cn/api/'
+VUE_APP_BASE_API = 'https://talk.cirray.cn/api/'

+ 48 - 48
vue-admin-template-master/src/permission.js

@@ -15,61 +15,61 @@ router.beforeEach(async (to, from, next) => {
 
   // set page title
   document.title = getPageTitle(to.meta.title);
-  // next();
+  next();
   // determine whether the user has logged in
   const hasToken = getToken();
   console.log(hasToken);
 
-  if (!!hasToken && typeof hasToken == "string") {
-    if (to.path === "/login") {
-      // if is logged in, redirect to the home page
-      next({ path: "/" });
-      NProgress.done();
-    } else {
-      const hasRoles = store.getters.roles && store.getters.roles.length > 0;
-      if (hasRoles) {
-        next();
-      } else {
-        const roles = await store.dispatch("user/setroles");
-        store.dispatch("GenerateRoutes", { roles }).then(() => {
-          // 生成可访问的路由表
-          router.options.routes = store.getters.addRouters;
-          router.addRoutes(store.getters.addRouters); // 动态添加可访问路由表
-          next({ ...to, replace: true }); // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
-        });
-      }
+  // if (!!hasToken && typeof hasToken == "string") {
+  //   if (to.path === "/login") {
+  //     // if is logged in, redirect to the home page
+  //     next({ path: "/" });
+  //     NProgress.done();
+  //   } else {
+  //     const hasRoles = store.getters.roles && store.getters.roles.length > 0;
+  //     if (hasRoles) {
+  //       next();
+  //     } else {
+  //       const roles = await store.dispatch("user/setroles");
+  //       store.dispatch("GenerateRoutes", { roles }).then(() => {
+  //         // 生成可访问的路由表
+  //         router.options.routes = store.getters.addRouters;
+  //         router.addRoutes(store.getters.addRouters); // 动态添加可访问路由表
+  //         next({ ...to, replace: true }); // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
+  //       });
+  //     }
 
-      // next()
-      // const hasGetUserInfo = store.getters.name
-      // if (hasGetUserInfo) {
-      //   next()
-      // } else {
-      //   try {
-      //     // get user info
-      //     await store.dispatch('user/getInfo')
+  //     // next()
+  //     // const hasGetUserInfo = store.getters.name
+  //     // if (hasGetUserInfo) {
+  //     //   next()
+  //     // } else {
+  //     //   try {
+  //     //     // get user info
+  //     //     await store.dispatch('user/getInfo')
 
-      //     next()
-      //   } catch (error) {
-      //     // remove token and go to login page to re-login
-      //     await store.dispatch('user/resetToken')
-      //     Message.error(error || 'Has Error')
-      //     next(`/login?redirect=${to.path}`)
-      //     NProgress.done()
-      //   }
-      // }
-    }
-  } else {
-    /* has no token*/
+  //     //     next()
+  //     //   } catch (error) {
+  //     //     // remove token and go to login page to re-login
+  //     //     await store.dispatch('user/resetToken')
+  //     //     Message.error(error || 'Has Error')
+  //     //     next(`/login?redirect=${to.path}`)
+  //     //     NProgress.done()
+  //     //   }
+  //     // }
+  //   }
+  // } else {
+  //   /* has no token*/
 
-    if (whiteList.indexOf(to.path) !== -1) {
-      // in the free login whitelist, go directly
-      next();
-    } else {
-      // other pages that do not have permission to access are redirected to the login page.
-      next(`/login?redirect=${to.path}`);
-      NProgress.done();
-    }
-  }
+  //   if (whiteList.indexOf(to.path) !== -1) {
+  //     // in the free login whitelist, go directly
+  //     next();
+  //   } else {
+  //     // other pages that do not have permission to access are redirected to the login page.
+  //     next(`/login?redirect=${to.path}`);
+  //     NProgress.done();
+  //   }
+  // }
 });
 
 router.afterEach(() => {

+ 61 - 38
vue-admin-template-master/src/views/goods/index.vue

@@ -37,8 +37,8 @@
           show-overflow-tooltip
         ></el-table-column>
         <el-table-column
-          prop="price3"
-          label="price3"
+          prop="priceleft"
+          label="priceleft"
           show-overflow-tooltip
         ></el-table-column>
         <el-table-column
@@ -57,8 +57,13 @@
           show-overflow-tooltip
         ></el-table-column>
         <el-table-column
-          prop="pricenow"
-          label="pricenow"
+          prop="price340"
+          label="price340"
+          width="100"
+        ></el-table-column>
+        <el-table-column
+          prop="pricehalf"
+          label="pricehalf"
           width="100"
         ></el-table-column>
         <el-table-column
@@ -175,21 +180,6 @@
           </el-row>
         </el-form-item> -->
 
-        <el-form-item prop="pricenow" label="现价">
-          <el-row :span="24">
-            <el-col :span="10">
-              <el-input
-                type="number"
-                v-model="dynamicValidateForm.pricenow"
-                placeholder="现价"
-              ></el-input>
-            </el-col>
-            <el-col :span="10" :offset="1">
-              <span>东阳江北店、横店店、义乌店用的是pricenow这个价格。</span>
-            </el-col>
-          </el-row>
-        </el-form-item>
-
         <el-form-item prop="priceorigin" label="原价">
           <el-row :span="24">
             <el-col :span="10">
@@ -202,35 +192,36 @@
           </el-row>
         </el-form-item>
 
-        <el-form-item prop="price3" label="price3">
+        <el-form-item prop="price279" label="price279">
           <el-row :span="24">
             <el-col :span="10">
               <el-input
                 type="number"
-                v-model="dynamicValidateForm.price3"
-                placeholder="price3"
+                v-model="dynamicValidateForm.price279"
+                placeholder="price279"
               ></el-input>
             </el-col>
             <el-col :span="10" :offset="1"
-              >。三七店、凤起路店、江汉路店用的是原价打五折。其余门店用price3价格</el-col
-            >
+              >SOHO中山广场店(279),太合中心店(300),宝龙城市广场店(332),九眼桥店(338),鹏瑞利店(339),凤起路店(348),江汉路店(349),观日路店(353),成都SFE展会店(374)
+            </el-col>
           </el-row>
         </el-form-item>
 
-        <el-form-item prop="price279" label="price279">
+        <el-form-item prop="price340" label="price340">
           <el-row :span="24">
             <el-col :span="10">
               <el-input
                 type="number"
-                v-model="dynamicValidateForm.price279"
-                placeholder="price279"
+                v-model="dynamicValidateForm.price340"
+                placeholder="price340"
               ></el-input>
             </el-col>
             <el-col :span="10" :offset="1"
-              >SOHO中山广场店(279),太合中心店(300),宝龙城市广场店(332),九眼桥店(338),鹏瑞利店(339)</el-col
+              >东阳江北店(340),横店店(351),北下朱店(352)</el-col
             >
           </el-row>
         </el-form-item>
+
         <el-form-item prop="price356" label="price356">
           <el-row :span="24">
             <el-col :span="10">
@@ -257,6 +248,30 @@
             <el-col :span="10" :offset="1">大融城门店价格</el-col>
           </el-row>
         </el-form-item>
+        <el-form-item prop="pricehalf" label="pricehalf">
+          <el-row :span="24">
+            <el-col :span="10">
+              <el-input
+                type="number"
+                v-model="dynamicValidateForm.pricehalf"
+                placeholder="pricehalf"
+              ></el-input>
+            </el-col>
+            <el-col :span="10" :offset="1">三七门店价格</el-col>
+          </el-row>
+        </el-form-item>
+        <el-form-item prop="priceleft" label="priceleft">
+          <el-row :span="24">
+            <el-col :span="10">
+              <el-input
+                type="number"
+                v-model="dynamicValidateForm.priceleft"
+                placeholder="priceleft"
+              ></el-input>
+            </el-col>
+            <el-col :span="10" :offset="1">其余门店用priceleft价格</el-col>
+          </el-row>
+        </el-form-item>
         <el-form-item prop="image" label="产品图片">
           <el-row :span="24">
             <el-col :span="10">
@@ -475,7 +490,6 @@ export default {
         id: "",
         name: "",
         nameeng: "",
-        pricenow: "",
         priceorigin: "",
         image: "",
         slides: [],
@@ -485,22 +499,25 @@ export default {
         property: "",
         // rule: "",
         price279: "",
-        price3: "",
+        priceleft: "",
         price356: "",
-        price375: ""
+        price375: "",
+        pricehalf: "",
+        price340: ""
       },
       rules: {
         id: [{ required: true, message: " ", trigger: "blur" }],
         name: [{ required: true, message: " ", trigger: "blur" }],
         // nameeng: [{ required: true, message: " ", trigger: "blur" }],
-        pricenow: [{ required: true, message: " ", trigger: "blur" }],
+        price340: [{ required: true, message: " ", trigger: "blur" }],
         priceorigin: [{ required: true, message: " ", trigger: "blur" }],
         image: [{ required: true, message: " ", trigger: "blur" }],
         category: [{ required: true, message: " ", trigger: "blur" }],
         price279: [{ required: true, message: " ", trigger: "blur" }],
-        price3: [{ required: true, message: " ", trigger: "blur" }],
+        priceleft: [{ required: true, message: " ", trigger: "blur" }],
         price356: [{ required: true, message: " ", trigger: "blur" }],
-        price375: [{ required: true, message: " ", trigger: "blur" }]
+        price375: [{ required: true, message: " ", trigger: "blur" }],
+        pricehalf: [{ required: true, message: " ", trigger: "blur" }]
         // recommendation: [{ required: true, message: " ", trigger: "blur" }]
       }
     };
@@ -548,7 +565,7 @@ export default {
           let params = Object.assign({}, this.dynamicValidateForm, {
             id: this.dynamicValidateForm.id - 0,
             slides: this.dynamicValidateForm.slides.join(";"),
-            pricenow: this.dynamicValidateForm.pricenow - 0,
+            price340: this.dynamicValidateForm.price340 - 0,
             priceorigin: this.dynamicValidateForm.priceorigin - 0
           });
           createSku(params)
@@ -579,7 +596,7 @@ export default {
             slides: this.dynamicValidateForm.slides
               ? this.dynamicValidateForm.slides.join(";")
               : "",
-            pricenow: this.dynamicValidateForm.pricenow - 0,
+            price340: this.dynamicValidateForm.price340 - 0,
             priceorigin: this.dynamicValidateForm.priceorigin - 0
           });
           editSku(params)
@@ -608,14 +625,20 @@ export default {
         id: "",
         name: "",
         nameeng: "",
-        pricenow: "",
         priceorigin: "",
         image: "",
         slides: [],
         category: "",
         recommendation: "",
         description: "",
-        property: ""
+        property: "",
+        // rule: "",
+        price279: "",
+        priceleft: "",
+        price356: "",
+        price375: "",
+        pricehalf: "",
+        price340: ""
       };
       this.dialogVisible = false;
       this.$refs[formName].resetFields();