Merge branch 'devlop' of http://git.qniao.cn/dengxiongfei/paper-shopkeeper-app into devlop

pages/mall/index.vue

@@ -111,7 +111,8 @@ export default {
       },
       listData: [],
       logo: 'https://qncloud.oss-cn-shenzhen.aliyuncs.com/ztb_pic/testPic.jfif',
-      backgroundStyle: 'background: url("/static/imgs/mall/zsc-bg-icon.png") no-repeat;'
+      backgroundStyle: 'background: url("/static/imgs/mall/zsc-bg-icon.png") no-repeat;',
+	  stoteInfo:''
     }
   },
   onShow() {
@@ -132,6 +133,7 @@ export default {
       storeDetail(id)
         .then((res) => {
           if (res) {
+			  this.stoteInfo = res
             this.$set(this.storeInformation, 'productNumber', res.productNumber)
             this.$set(this.storeInformation, 'currentProductNumber', res.currentProductNumber)
             if (res.logo === '') {
@@ -214,7 +216,7 @@ export default {
     },
     // 店铺设置按钮
     setting(item) {
-      go2('store-settings')
+      go2('store-settings',this.stoteInfo)
     },
     // 详情点击事件
     detailInfo(item) {

pages/store-settings/index.vue

@@ -25,7 +25,7 @@
 				<view class="store-log store-image-flex">
 					<uni-file-picker
 						class="stotr-image-width"
-						v-model="imageValue"
+						v-model="logoImage"
 						file-mediatype="image"
 						mode="grid"
 						file-extname="png,jpg"
@@ -35,6 +35,7 @@
 						@success="success"
 						@fail="fail"
 						@select="select"
+						@delete="deleteLogo"
 					>
 						<image class="paper-upload-image" src="../../static/imgs/trade/uploadImage.png" mode=""></image>
 					</uni-file-picker>
@@ -44,7 +45,7 @@
 			<view class="store-log">
 				<view class="tore-setting-name"><text>背景图片</text></view>
 				<view class="store-log store-image-flex">
-					<uni-file-picker class="stotr-image-widtht" @select="backSelect" :limit="1" fileMediatype="image" :image-styles="imageStylest">
+					<uni-file-picker @delete="deleteImage" class="stotr-image-widtht" v-model="backgroundImage" @select="backSelect" :limit="1" fileMediatype="image" :image-styles="imageStylest">
 						<image class="paper-upload-image" src="../../static/imgs/trade/uploadImage.png" mode=""></image>
 					</uni-file-picker>
 					<view class="store-image-text">建议尺寸：750*370像素，尺寸不匹配时，图片将被压缩或拉伸以铺满画面</view>
@@ -64,7 +65,8 @@ export default {
 	data() {
 		return {
 			storeName: '',
-			imageValue: [],
+			logoImage: [],
+			backgroundImage:[],
 			background: '',
 			logo: '',
 			imageStyles: {
@@ -82,7 +84,29 @@ export default {
 	},
 	onLoad(option) {
 		if (option) {
+			this.logoImage = []
+			this.backgroundImage = []
 			this.option = option
+			this.storeName = this.option.name
+			this.background = this.option.backgroundImg
+			this.logo = this.option.logo
+			if(this.option.logo !== ""){
+				var logoImage = {
+					name:'text',
+					type:'image',
+					url:this.option.logo
+				}
+				this.logoImage.push(logoImage)
+			}
+			if(this.option.backgroundImg !== ""){
+				var backgroundImage = {
+					name:'text',
+					type:'image',
+					url:this.option.backgroundImg
+				}
+				this.backgroundImage.push(backgroundImage)
+			}
+			
 		}
 		
 	},
@@ -102,18 +126,19 @@ export default {
 		select(item) {
 			this.postuploadFile(item.tempFiles[0], 'logo')
 		},
-		backSelect(item) {
-			this.postuploadFile(item.tempFiles[0], 'background')
+		// 删除logo
+		deleteLogo(item) {
+			console.log('deleteImage', item)
+			this.logo = ''
 		},
-		// 删除图片
+		// 删除背景图
 		deleteImage(item) {
 			console.log('deleteImage', item)
-			for (let i = 0; i < this.imageValue.length; i++) {
-				if (this.imageValue[i].uuid === item.tempFile.uuid) {
-					this.imageValue.splice(i, 1)
-				}
-			}
-			console.log(this.imageValue)
+			this.background = ''
+		},
+		backSelect(item) {
+			console.log('item',item)
+			this.postuploadFile(item.tempFiles[0], 'background')
 		},
 		postuploadFile(path, type) {
 			uploadFile(path.path).then(val => {