1111

package.json

@@ -3,10 +3,10 @@
   "version": "3.0.0",
   "private": true,
   "scripts": {
-    "serve": "export NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve",
-    "build": "export NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service build",
+    "serve": "set NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve",
+    "build": "set NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service build",
     "test:unit": "vue-cli-service test:unit",
-    "lint": "vue-cli-service lint",
+    "lint": "set NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service lint",
     "build:preview": "vue-cli-service build --mode preview",
     "lint:nofix": "vue-cli-service lint --no-fix"
   },
@@ -35,7 +35,8 @@
     "vue-svg-component-runtime": "^1.0.1",
     "vue-ueditor-wrap": "^2.4.4",
     "vuedraggable": "^2.24.0",
-    "vuex": "^3.1.1"
+    "vuex": "^3.1.1",
+    "yarn": "^1.22.21"
   },
   "devDependencies": {
     "@ant-design/colors": "^3.2.1",

public/config.js

@@ -5,7 +5,7 @@ window.publicConfig = {
   // 必填: api地址, 换成自己的域名即可
   // 例如: https://www.你的域名.com/index.php?s=/store
   // BASE_API: '../index.php?s=/store',
-  BASE_API: 'http://www.yzshop.cn/index.php?s=/store',
+  BASE_API: 'https://www.saas.njrenzhou.com/index.php?s=/store',
 
   // 图片文件上传大小 (单位mb)
   uploadImageSize: 2,

src/common/model/goods/Index.js

@@ -91,7 +91,7 @@ export default {
     goodsInfo.categorys = this.formatCategoryIds(goodsInfo.categoryIds)
     // 商品基本数据
     const goodsFormData = _.pick(goodsInfo, [
-      'goods_type', 'goods_name', 'categorys', 'goods_no', 'sort','is_brand','is_new',
+      'goods_type', 'goods_name', 'categorys', 'goods_no', 'sort','is_brand','is_new','paihang','remaizhishu',
       'status', 'spec_type', 'deduct_stock_type', 'is_restrict', 'content',
       'selling_point', 'serviceIds', 'sales_initial', 'is_points_gift',
       'is_points_discount', 'is_enable_grade', 'is_alone_grade', 'is_ind_dealer',

src/views/goods/Create.vue

@@ -73,6 +73,15 @@
             <a-form-item label="商品编码" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-input placeholder="请输入商品编码" v-decorator="['goods_no']" />
             </a-form-item>
+
+            <a-form-item label="所属分类排行(0表示不参加排行)" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input placeholder="所属分类排行" v-decorator="['paihang']" />
+            </a-form-item>
+
+            <a-form-item label="热卖指数" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input placeholder="热卖指数" v-decorator="['remaizhishu']" />
+            </a-form-item>
+
             <a-form-item
               v-if="form.getFieldValue('goods_type') == 10"
               label="配送方式"

src/views/goods/Update.vue

@@ -75,6 +75,15 @@
             <a-form-item label="商品编码" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-input placeholder="请输入商品编码" v-decorator="['goods_no']" />
             </a-form-item>
+
+            <a-form-item label="所属分类排行(0表示不参加排行)" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input placeholder="所属分类排行" v-decorator="['paihang']" />
+            </a-form-item>
+
+            <a-form-item label="热卖指数" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input placeholder="热卖指数" v-decorator="['remaizhishu']" />
+            </a-form-item>
+
             <a-form-item
               v-if="form.getFieldValue('goods_type') == 10"
               label="配送方式"

src/views/goods/category/modules/AddForm.vue

@@ -27,6 +27,12 @@
         <a-form-item label="分类图片" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <SelectImage v-decorator="['image_id']" />
         </a-form-item>
+        <a-form-item label="是否加入排行榜" :labelCol="labelCol" :wrapperCol="wrapperCol" extra="是否加入排行榜">
+          <a-radio-group v-decorator="['is_paihang', { initialValue: 0, rules: [{ required: true }] }]">
+            <a-radio :value="0">不加入</a-radio>
+            <a-radio :value="1">加入</a-radio>
+          </a-radio-group>
+        </a-form-item>
         <a-form-item label="状态" :labelCol="labelCol" :wrapperCol="wrapperCol" extra="用户端是否展示">
           <a-radio-group v-decorator="['status', { initialValue: 1, rules: [{ required: true }] }]">
             <a-radio :value="1">显示</a-radio>

src/views/goods/category/modules/EditForm.vue

@@ -30,6 +30,12 @@
             v-decorator="['image_id']"
           />
         </a-form-item>
+        <a-form-item label="是否加入排行榜" :labelCol="labelCol" :wrapperCol="wrapperCol" extra="是否加入排行榜">
+          <a-radio-group v-decorator="['is_paihang', { initialValue: 0, rules: [{ required: true }] }]">
+            <a-radio :value="0">不加入</a-radio>
+            <a-radio :value="1">加入</a-radio>
+          </a-radio-group>
+        </a-form-item>
         <a-form-item label="状态" :labelCol="labelCol" :wrapperCol="wrapperCol" extra="用户端是否展示">
           <a-radio-group v-decorator="['status', { initialValue: 1, rules: [{ required: true }] }]">
             <a-radio :value="1">显示</a-radio>
@@ -105,7 +111,7 @@ export default {
       const { record, form: { setFieldsValue } } = this
       // 设置表单内容
       this.$nextTick(() => {
-        setFieldsValue(_.pick(record, ['name', 'parent_id', 'image_id', 'status', 'sort']))
+        setFieldsValue(_.pick(record, ['name', 'parent_id', 'image_id', 'status', 'sort','is_paihang']))
       })
     },