更新Note

1. 修复购物车,订单和退单后后置任务正确执行
	2. 修复佣金记录金额和详情
	3. 修复管理端 移动应用界面下订单管理数据统计不准确的问题
	4. 修复短信API升级-后台使用一号通
	5. 修复用户管理相关问题
	6. 修复核销点核销后核销地址不准确
	7. 修复资源同步云服务的问题
新增功能
	1. 秒杀
		a. 秒杀时段配置
		b. 秒杀商品维护
	2. 财务管理
		a. 申请提现
		b. 财务记录
			i. 充值记录
			ii. 资金监控
		c. 佣金记录
	3. 普通商品显示该商品正在参加的活动信息[秒杀]

admin/src/components/uploadPicture/forGenrator/index.vue

@@ -14,7 +14,7 @@
         <img :src="item.sattDir">
         <i class="el-icon-error btndel" @click="handleRemove(index)" />
       </div>
-      <div class="upLoadPicBox" @click="modalPicTap('2')">
+      <div class="upLoadPicBox" @click="modalPicTap('2')" v-show="imageList.length<20">
         <div class="upLoad">
           <i class="el-icon-camera cameraIconfont" />
         </div>
@@ -31,7 +31,7 @@
       :visible.sync="visible"
       width="896px"
       :before-close="handleClose"
-      z-index="3004"
+       :modal="false"
     >
       <upload-index v-if="visible" :checkedMore="imageList" :isMore="isMore" @getImage="getImage" />
     </el-dialog>
@@ -98,7 +98,7 @@ export default {
     },
     handleRemove (i) {
       this.imageList.splice(i, 1)
-      this.$emit('input', this.imageList.join(','))
+      this.$emit('input', JSON.stringify(this.imageList))
     },
     // 移动
     handleDragStart (e, item) {

admin/src/components/uploadPicture/index.vue

@@ -112,8 +112,9 @@
                 :key="index"
                 class="gridPic"
               >
-                <img v-if="index === 0" v-lazy="item.localImg?item.localImg:item.sattDir" :class="item.isSelect ? 'on': '' " @click="changImage(item, index, pictrueList.list)" />
-                <img v-else v-lazy="item.sattDir?item.sattDir:localImg" :class="item.isSelect ? 'on': '' " @click="changImage(item, index, pictrueList.list)" />
+                <img v-lazy="item.sattDir?item.sattDir:localImg" :class="item.isSelect ? 'on': '' " @click="changImage(item, index, pictrueList.list)" />
+                <!--<img v-if="index === 0" v-lazy="item.localImg?item.localImg:item.sattDir" :class="item.isSelect ? 'on': '' " @click="changImage(item, index, pictrueList.list)" />-->
+                <!--<img v-else v-lazy="item.sattDir?item.sattDir:localImg" :class="item.isSelect ? 'on': '' " @click="changImage(item, index, pictrueList.list)" />-->
               </div>
             </div>
           </div>
@@ -123,6 +124,7 @@
             :page-sizes="[12, 24, 48, 60]"
             :page-size="tableData.limit"
             :current-page="tableData.page"
+            :pager-count="5"
             layout="total, sizes, prev, pager, next, jumper"
             :total="pictrueList.total"
             @size-change="handleSizeChange"

admin/src/components/uploadPicture/uploadFrom/index.vue

@@ -3,8 +3,9 @@
     <el-dialog
       title="上传图片"
       :visible.sync="visible"
-      width="896px"
+      width="950px"
       :modal="false"
+      append-to-body
       :before-close="handleClose"
     >
       <upload-index v-if="visible" :isMore="isMore" :modelName="modelName" @getImage="getImage" />
@@ -22,7 +23,8 @@ export default {
       visible: false,
       callback: function() {},
       isMore: '',
-      modelName: ''
+      modelName: '',
+      ISmodal: false
     }
   },
   watch: {