新增参数

buyer/src/api/goods.js

@@ -4,21 +4,23 @@ import request, {
 
 // 商品列表
 export function goodsList (params) {
+  params.salesModel = "WHOLESALE";
   return request({
     url: '/buyer/goods/es',
     method: Method.GET,
     needToken: false,
-    params
+    params,
   });
 }
 
 // 商品分类 筛选条件  品牌， 尺寸等
 export function filterList (params) {
+  params.salesModel = "WHOLESALE";
   return request({
     url: '/buyer/goods/es/related',
     method: Method.GET,
     needToken: false,
-    params
+    params,
   });
 }
 
@@ -68,6 +70,6 @@ export function hotWords (params) {
     url: `/buyer/goods/hot-words`,
     method: Method.GET,
     needToken: false,
-    params
+    params,
   });
 }

buyer/src/components/goodsDetail/ShowGoods.vue

@@ -122,6 +122,30 @@
               <span class="inventory"> {{skuDetail.weight}}kg</span>
             </div>
           </div>
+          <div class="item-select">
+            <div class="item-select-title">
+              <p>生产企业</p>
+            </div>
+            <div class="item-select-row">
+              <span class="inventory"> {{skuDetail.productEnterprise}}</span>
+            </div>
+          </div>
+          <div class="item-select">
+            <div class="item-select-title">
+              <p>生产批号</p>
+            </div>
+            <div class="item-select-row">
+              <span class="inventory"> {{skuDetail.productBitchNo}}</span>
+            </div>
+          </div>
+                    <div class="item-select">
+            <div class="item-select-title">
+              <p>过期时间</p>
+            </div>
+            <div class="item-select-row">
+              <span class="inventory"> {{skuDetail.expireDate}}</span>
+            </div>
+          </div>
           <div class="add-buy-car" v-if="$route.query.way === 'POINT' && skuDetail.isAuth === 'PASS'">
             <Button type="error" :loading="loading" :disabled="skuDetail.quantity === 0" @click="pointPay">积分购买</Button>
           </div>

buyer/src/config/index.js

@@ -17,15 +17,15 @@ export default {
    * @description api请求基础路径
    */
   api_dev: {
-    // common: 'http://localhost:8890',
-    // buyer: 'http://localhost:8888',
-    // seller: 'http://localhost:8889',
-    // manager: 'http://localhost:8887'
+    common: 'http://localhost:8890',
+    buyer: 'http://localhost:8888',
+    seller: 'http://localhost:8889',
+    manager: 'http://localhost:8887'
     //
-    common: 'http://shop-buyer.nanyue6688.com/common-api',
-    buyer: 'http://shop-buyer.nanyue6688.com/buyer-api',
-    seller: 'http://shop-buyer.nanyue6688.com/seller-api',
-    manager: 'http://shop-buyer.nanyue6688.com/manager-api'
+    // common: 'http://shop-buyer.nanyue6688.com/common-api',
+    // buyer: 'http://shop-buyer.nanyue6688.com/buyer-api',
+    // seller: 'http://shop-buyer.nanyue6688.com/seller-api',
+    // manager: 'http://shop-buyer.nanyue6688.com/manager-api'
   },
   api_prod: {
     common: 'http://shop-buyer.nanyue6688.com/common-api',

buyer/src/pages/GoodsList.vue

@@ -167,7 +167,6 @@ export default {
     },
     getGoodsList () {
       this.loading = true;
-      this.params.salesModel = "RETAIL"
       apiGoods.goodsList(this.params)
         .then((res) => {
           this.loading = false;

manager/src/views/goods/goods-info/goodsDetail.vue

@@ -13,7 +13,15 @@
             <FormItem label="商品名称" prop="goodsName">
               {{ goods.goodsName }}
             </FormItem>
-
+            <FormItem label="生产企业">
+              {{ goods.productEnterprise }}
+            </FormItem>
+            <FormItem label="生产批号">
+              {{ goods.productBitchNo }}
+            </FormItem>
+            <FormItem label="过期时间">
+              {{ goods.expireDate }}
+            </FormItem>
             <FormItem label="商品卖点" prop="sellingPoint">
               {{ goods.sellingPoint }}
             </FormItem>

seller/src/config/index.js

@@ -21,7 +21,7 @@ export default {
     // common: 'http://nanyue-sell.nanyue6688.com/common-api',
     // buyer: 'http://nanyue-sell.nanyue6688.com/buyer-api',
     // seller: 'http://nanyue-sell.nanyue6688.com/seller-api',
-    // manager: 'http://nanyue-sell.nanyue6688.com/manager-api'
+    // manager: 'http://nanyue-sell.nanyue6688.com/manager-api',
     common: 'http://192.168.1.48:8890',
     buyer: 'http://192.168.1.48:8888',
     seller: 'http://192.168.1.48:8889',

seller/src/views/goods/goods-seller/goodsOperation.vue

@@ -134,7 +134,15 @@
             <FormItem label="商品名称" prop="goodsName">
               <Input type="text" v-model="baseInfoForm.goodsName" placeholder="商品名称" clearable style="width: 260px"/>
             </FormItem>
-
+            <FormItem label="生产企业" prop="productEnterprise">
+              <Input type="text" v-model="baseInfoForm.productEnterprise" placeholder="生产企业" clearable style="width: 260px"/>
+            </FormItem>
+            <FormItem label="生产批号" prop="productBitchNo">
+              <Input type="text" v-model="baseInfoForm.productBitchNo" placeholder="生产批号" clearable style="width: 260px"/>
+            </FormItem>
+            <FormItem label="过期时间" prop="expireDate">
+              <Date-picker type="date" v-model="baseInfoForm.expireDate" format="yyyy年MM月dd日" placeholder="选择日期" @on-change="handleExpireDate" style="width: 260px"></Date-picker>
+            </FormItem>
             <FormItem label="商品卖点" prop="sellingPoint">
               <Input v-model="baseInfoForm.sellingPoint" type="textarea" :rows="4" style="width: 260px"/>
             </FormItem>
@@ -669,6 +677,12 @@ export default {
         brandId: 0,
         /** 计量单位 **/
         goodsUnit: "",
+        /** 生产批号 **/
+        productBitchNo: "",
+        /**  生产企业 **/
+        productEnterprise: "",
+        /** 过期时间 **/
+        expireDate: "",
         /** 商品类型 **/
         goodsType: "",
         /** 分类路径 **/
@@ -730,6 +744,15 @@ export default {
             message: "长度在 3 到 60 个字符",
           },
         ],
+        productEnterprise: [
+          {required: true, message: "请输入生产企业"},
+        ],
+        productBitchNo: [
+          {required: true, message: "请输入生产批号"},
+        ],
+        expireDate: [
+          {required: true, message: "请输入过期时间"},
+        ],
         sn: [
           {required: true, message: "请输入商品编号"},
           {validator: checkSn},
@@ -1585,6 +1608,9 @@ export default {
       ids = ids.substring(0, ids.length - 1);
       this.baseInfoForm.storeCategoryPath = ids;
     },
+    handleExpireDate(value){
+      this.baseInfoForm.expireDate = value;
+    },
     /**  添加商品 **/
     save() {
       this.submitLoading = true;