From 4b7e67d6c6605812763c0ead7c5a428b2cfd6298 Mon Sep 17 00:00:00 2001
From: wangfukang <15630117759@163.com>
Date: Sat, 1 Jun 2024 08:51:38 +0800
Subject: [PATCH] 11

---
 package1/AI/addAiList.vue      | 61 ++++++++++++++++++++++++++++++----
 package1/index/orderDetail.vue |  4 +--
 2 files changed, 56 insertions(+), 9 deletions(-)

diff --git a/package1/AI/addAiList.vue b/package1/AI/addAiList.vue
index 0d80887..2d4f1d7 100644
--- a/package1/AI/addAiList.vue
+++ b/package1/AI/addAiList.vue
@@ -71,8 +71,8 @@
 								</view>
 							</view>
 							<view class="one-goods" @tap="pictureAdd(value[0])">
-								上传子图
-								<view style="width: 20rpx;height: 20rpx;border-radius: 20rpx;color: #fff;background: red;position: absolute;top: -5px;right: -5px;">
+								上传多图
+								<view class="jiaobiao" v-if="value[1].childrenList.length > 0">
 									{{value[1].childrenList.length}}
 								</view>
 							</view>
@@ -469,6 +469,21 @@
 					<img src="/static/images/maikefeng.png" style="width: 80%;height: 80%;margin: 10%;" alt="">
 				</view>
 			</view>
+		</uni-popup>
+		<!-- 弹出子图轮播 -->
+		<uni-popup ref="showImgDiaLog" background-color="#fff">
+			<view class="showImg-box">
+				<uni-swiper-dot class="uni-swiper-dot-box" @clickItem="clickItem" :info="childrenList" :current="current" :mode="round"
+					:dots-styles="dotsStyles">
+					<swiper class="swiper-box" @change="lunbochange" autoplay="true" :current="current">
+						<swiper-item v-for="(item, index) in childrenList" :key="index">
+							<view class="swiper-item" :class="'swiper-item' + index">
+								<img :src="item" alt="" />
+							</view>
+						</swiper-item>
+					</swiper>
+				</uni-swiper-dot>
+			</view>
 		</uni-popup>
 		<view class="voice-model" v-if="recordState == true">
 			<img src="/static/images/maikefeng.png" alt="">
@@ -532,7 +547,8 @@
 				indexList: [],
 				evalue: [],
 				attributeValue: [],
-				specifications: '',
+				specifications: '',
+				current:0,
 				currentAnchor: '',
 				temporaryNum: 0,
 				isBottom: false,
@@ -1664,6 +1680,12 @@
 			change() {
 				this.allChangeNum = 0
 				this.oldTemList = []
+			},
+			lunbochange(e) {
+				this.current = e.detail.current
+			},
+			clickItem(e) {
+				this.current = e
 			},
 			//弹出商品规格选择
 			toggle(type, id) {
@@ -1892,7 +1914,14 @@
 				let that = this
 				if(id != ''){  //上传子图
 					this.childrenId = id
-				}
+					if(this.carList.get(id).childrenList.length > 0){
+						this.childrenList = this.carList.get(id).childrenList
+						this.$refs.showImgDiaLog.open()
+						return;
+					}
+				}
+				
+				
 				uni.chooseMedia({
 					count: 9,
 					mediaType: ['image'],
@@ -1925,12 +1954,13 @@
 					success: (uploadFileRes) => {
 						let pathData = JSON.parse(uploadFileRes.data)
 						console.log('pathData',pathData)
-						if(this.childrenId != ''){
-							this.carList.get(this.childrenId).childrenList.push(pathData.result)
+						if(that.childrenId != ''){
+							that.carList.get(that.childrenId).childrenList.push(pathData.result)
+							that.$forceUpdate()
 						}else{
 							that.addPageGoods(pathData.result)
 						}
-						console.log('carList子图',this.carList)
+						console.log('carList子图',that.carList)
 					},
 					fail: (err) => {
 						uni.hideLoading();
@@ -3222,5 +3252,22 @@
 		color: #fff;
 		border-radius: 5px;
 		position: relative;
+	}
+	.jiaobiao{
+		width: 40rpx;
+		height: 40rpx;
+		border-radius: 10px;
+		color: #fff;
+		background: red;
+		position: absolute;
+		top: -5px;
+		right: -5px;
+		text-align: center;
+		line-height: 40rpx;
+		font-size: 28rpx;
+	}
+	.showImg-box{
+		width: 500rpx;
+		height: 500rpx;
 	}
 </style>
\ No newline at end of file
diff --git a/package1/index/orderDetail.vue b/package1/index/orderDetail.vue
index 570c2d1..a381e8b 100644
--- a/package1/index/orderDetail.vue
+++ b/package1/index/orderDetail.vue
@@ -841,8 +841,8 @@
 					.companyName : '暂无'))
 				strCmd += blesdk.addCPCLSETMAG(2, 2)
 				strCmd += blesdk.addCPCLText('0', '650', '24', '0', 0, '——————————————————————————————')
-				strCmd += blesdk.addCPCLText('50', '730', '24', '0', 0, '店铺：' + maskShopName(this.sales.shopName))
-				strCmd += blesdk.addCPCLText('50', '810', '24', '0', 0, maskPhone(this.sales.createByPhone))
+				strCmd += blesdk.addCPCLText('50', '730', '24', '0', 0, '店铺：' + this.sales.shopName)
+				strCmd += blesdk.addCPCLText('50', '810', '24', '0', 0, this.sales.createByPhone)
 				strCmd += blesdk.addCPCLText('50', '890', '24', '0', 0, '地址：' + this.shopData.shopAddress)
 				strCmd += blesdk.addCPCLLocation(0);
 				strCmd += blesdk.addCPCLPrint();