Merge branch 'v5.1.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.1.0dev

template/admin/src/pages/order/orderList/handle/orderDetails.vue

@@ -1,6 +1,6 @@
 <template>
   <div v-if="orderDatalist">
-    <Drawer title="订单详情" :closable="false" width="700" v-model="modals" scrollable>
+    <Drawer title="订单详情" :mask-closable="false" width="700" v-model="modals" scrollable>
       <Card :bordered="false" dis-hover class="i-table-no-border">
         <div class="ivu-description-list-title">收货信息</div>
         <Row class="mb10">

template/admin/src/pages/user/list/handle/userDetails.vue

@@ -1,6 +1,6 @@
 <template>
   <div style="width: 100%">
-    <Drawer title="用户详情" :closable="false" width="1100" scrollable v-model="modals" @on-visible-change="draChange">
+    <Drawer title="用户详情" :mask-closable="false" width="1100" scrollable v-model="modals" @on-visible-change="draChange">
       <Spin size="large" fix v-if="spinShow"></Spin>
       <div class="acea-row head">
         <div class="avatar mr15"><img :src="psInfo.avatar" /></div>

template/admin/src/pages/user/list/index.vue

@@ -368,7 +368,7 @@
         @onceGetList="onceGetList"
       ></userLabel>
     </Modal>
-    <Drawer :closable="false" width="700" v-model="modals" title="用户信息填写">
+    <Drawer :mask-closable="false" width="700" v-model="modals" title="用户信息填写">
       <userEdit ref="userEdit" v-if="modals" :userData="userData"></userEdit>
       <div class="demo-drawer-footer">
         <Button style="margin-right: 8px" @click="modals = false">取消</Button>

template/uni-app/components/productWindow/index.vue

@@ -151,7 +151,7 @@
 			 * 
 			 */
 			bindCode: function(e) {
-				this.$emit('iptCartNum', this.attr.productSelect.cart_num);
+				this.$emit('iptCartNum', e);
 			},
 			closeAttr: function() {
 				this.$emit('myevent');

template/uni-app/pages/goods_details/index.vue

@@ -806,7 +806,15 @@
 			 *
 			 */
 			iptCartNum: function(e) {
-				this.$set(this.attr.productSelect, "cart_num", e);
+				if (e) {
+					let number = 1
+					if (Number.isInteger(parseInt(e)) && parseInt(e) > 0) {
+						number = parseInt(e);
+					}
+					this.$nextTick(e => {
+						this.$set(this.attr.productSelect, "cart_num", e < 0 ? 1 : number);
+					})
+				}
 			},
 			// 后退
 			returns() {