id

.env.production

@@ -3,4 +3,4 @@ ENV = 'production'
 
 # base api
 VUE_APP_BASE_API = https://yunyubang.ali251.langye.net/
-VUE_APP_BASE_DEV_API = https://yybtest.ali251.langye.net/
+#VUE_APP_BASE_DEV_API = https://yybtest.ali251.langye.net/

package.json

@@ -22,6 +22,7 @@
     "element-ui": "2.13.2",
     "js-cookie": "2.2.0",
     "js-xlsx": "^0.8.22",
+    "less": "^3.13.1",
     "less-loader": "^5.0.0",
     "moment": "^2.29.2",
     "normalize.css": "7.0.0",

src/views/activity/activityList.vue

@@ -109,6 +109,13 @@ export default {
       state:'',
       activeTypeList:[],
       table:[
+        {
+          prop:'id',
+          label: 'id',
+          width: 50,
+          align: 'center',
+          fixed: 'left'
+        },
         {
           label:"活动名称",
           width: 220,

src/views/productService/components/addProduct.vue

@@ -122,6 +122,19 @@
           </div>
         </div>
       </template>
+      <template v-slot:can_buy>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>是否可购买：
+          </div>
+          <div class="xy-table-item-content number-input">
+            <el-select placeholder="请选择是否可购买" style="width: 300px" v-model="form.can_buy">
+              <el-option v-for="item in [{id:1,name:'是'},{id:0,name:'否'}]" :key="item.id" :value="item.id" :label="item.name">
+              </el-option>
+            </el-select>
+          </div>
+        </div>
+      </template>
       <template v-slot:originalPrice>
         <div class="xy-table-item">
           <div class="xy-table-item-label">
@@ -323,6 +336,7 @@
           productTypePid: '',
           productTypeId: '',
           model:[],
+          can_buy:1,
           originalPrice: '',
           price: '',
           fee: '',
@@ -440,7 +454,9 @@
           productTypePid: res?.product_type_pid,
           productTypeId: res?.product_type_id,
           model:res.model?JSON.parse(res.model):[],
+          can_buy:res?.can_buy,
           originalPrice: res?.original_price,
+
           price: res?.price,
           fee: res?.fee,
           sharing: res?.sharing,
@@ -532,6 +548,7 @@
             product_type_pid: this.form.productTypePid,
             product_type_id: this.form.productTypeId,
             model:this.form.model,
+            can_buy:this.form.can_buy,
             original_price: this.form.originalPrice.toString(),
             price: this.form.price.toString(),
             fee: this.form.fee.toString(),
@@ -564,6 +581,7 @@
             product_type_pid: this.form.productTypePid,
             product_type_id: this.form.productTypeId,
             model:this.form.model,
+                        can_buy:this.form.can_buy,
             original_price: this.form.originalPrice.toString(),
             price: this.form.price.toString(),
             fee: this.form.fee.toString(),
@@ -593,6 +611,9 @@
           if (this.type === 'editor'||this.type === 'copy') {
             this.getDetail()
           }
+          if(this.type==='add'){
+            this.form.can_buy = 1
+          }
 
         } else {
           // this.$refs['tinymce'].setContent(' ')

src/views/productService/productServiceManage.vue

@@ -154,6 +154,12 @@
         total: 0,
         list: [],
         table: [{
+          prop:'id',
+          label: 'id',
+          width: 50,
+          align: 'center',
+          fixed: 'left'
+        },{
             prop: 'name',
             label: '名称',
             width: 260,