cmy 1 rok pred
rodič
commit
f78284aab7

+ 2 - 0
src/pages/order/orderList/components/tableFrom.vue

@@ -88,6 +88,8 @@
               placeholder="全部"
             >
               <Option value="0">普通订单</Option>
+              <Option value="901">抢购订单</Option>
+              <Option value="902">报单订单</Option>
               <Option value="1">秒杀订单</Option>
               <Option value="2">砍价订单</Option>
               <Option value="3">拼团订单</Option>

+ 11 - 1
src/pages/product/productAdd/index.vue

@@ -242,7 +242,16 @@
 		    <FormItem label="赠送分红额度:" prop="">
 		      <Input
 		          v-model="formValidate.give_award_range"
-		          placeholder="请输入商品编码"
+		          placeholder="请输入赠送数量"
+		          v-width="'50%'"
+		      />
+		    </FormItem>
+		  </Col>
+		  <Col span="24">
+		    <FormItem label="赠送绿积分:" prop="">
+		      <Input
+		          v-model="formValidate.give_green_integral"
+		          placeholder="请输入赠送绿积分数量"
 		          v-width="'50%'"
 		      />
 		    </FormItem>
@@ -2296,6 +2305,7 @@ export default {
         auto_on_time:'',
         video_open: false, //视频按钮是否显示
 		give_award_range:'',
+		give_green_integral:'',
         store_name: "",
         freight: 1, //运费设置
         postage: 0, //设置运费金额