Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui into dev-feature

manager/src/components/lili/upload-pic-input.vue

@@ -14,7 +14,7 @@
           <Poptip slot="append" transfer trigger="hover" title="图片预览" placement="right">
             <Icon type="md-eye" class="see-icon" />
             <div slot="content">
-              <img :src="currentValue" alt="该资源不存在" style="width: 100%;margin: 0 auto;display: block;" />
+              <img :src="currentValue" alt="该资源不存在" style="max-width: 300px;margin: 0 auto;display: block;" />
               <a @click="viewImage=true" style="margin-top:5px;text-align:right;display:block">查看大图</a>
             </div>
           </Poptip>
@@ -40,7 +40,7 @@
     </div>
 
     <Modal title="图片预览" v-model="viewImage" :styles="{top: '30px'}" draggable>
-      <img :src="currentValue" alt="该资源不存在" style="width: 100%;margin: 0 auto;display: block;" />
+      <img :src="currentValue" alt="该资源不存在" style="max-width: 300px;margin: 0 auto;display: block;" />
       <div slot="footer">
         <Button @click="viewImage=false">关闭</Button>
       </div>

manager/src/views/member/list/index.vue

@@ -325,6 +325,7 @@ export default {
   methods: {
     // 回调给父级
     callback(val, index) {
+      this.selectMember.forEach(item=>{item.___selected = false})
       this.$set(val, "___selected", !val.___selected);
       console.log(val.___selected);
       console.log(this.selectMember);

manager/src/views/order/after-order/afterSaleOrderDetail.vue

@@ -84,7 +84,7 @@
             <dl>
               <dt>实际退款金额</dt>
               <dd>
-                <Input v-model="params.actualRefundPrice" style="width: 260px" />
+                <InputNumber :min="0" v-model="params.actualRefundPrice" style="width: 260px" />
               </dd>
             </dl>
             <dl>

manager/src/views/promotions/points-goods/points-goods-add.vue

@@ -28,7 +28,8 @@
                 </template>
 
                 <template slot-scope="{ index }" slot="settlementPrice">
-                  <Input
+                  <InputNumber
+                    :min="0"
                     type="number"
                     v-model="promotionGoodsList[index].settlementPrice"
                   />
@@ -54,10 +55,18 @@
                   </Select>
                 </template>
                 <template slot-scope="{ index }" slot="activeStock">
-                  <Input type="number" v-model="promotionGoodsList[index].activeStock" />
+                  <InputNumber
+                    :min="0"
+                    type="number"
+                    v-model="promotionGoodsList[index].activeStock"
+                  />
                 </template>
                 <template slot-scope="{ index }" slot="points">
-                  <Input type="number" v-model="promotionGoodsList[index].points" />
+                  <InputNumber
+                    :min="0"
+                    type="number"
+                    v-model="promotionGoodsList[index].points"
+                  />
                 </template>
               </Table>
             </FormItem>
@@ -370,8 +379,8 @@ export default {
           settlementPrice: e.settlementPrice || 0,
           pointsGoodsCategoryId: e.pointsGoodsCategoryId || 0,
           pointsGoodsCategoryName: e.pointsGoodsCategoryName || "",
-          activeStock: e.activeStock || 0,
+          activeStock: e.activeStock || 1,
-          points: e.points || 0,
+          points: e.points || 1,
           skuId: e.id,
           goodsId: e.goodsId,
           originalPrice: e.price || 0,

manager/src/views/promotions/points-goods/points-goods-edit.vue

@@ -118,6 +118,7 @@ export default {
         settlementPrice: [{ required: true, message: "请填写结算价格" }],
         pointsGoodsCategoryId: [{ required: true, message: "请选择积分商品分类" }],
         points: [{ required: true, message: "请填写兑换积分" }],
+        activeStock: [{ required: true, message: "请填写库存" }],
       },
       options: {
         disabledDate(date) {

seller/src/views/order/after-order/reurnGoodsOrderDetail.vue

@@ -94,7 +94,7 @@
               <dl v-if="params.serviceStatus == 'PASS'">
                 <dt>实际退款金额</dt>
                 <dd>
-                  <Input v-model="params.actualRefundPrice" style="width:260px" />
+                  <InputNumber :min="0" v-model="params.actualRefundPrice" style="width:260px" />
                 </dd>
               </dl>
               <dl>