提交

pages/index/index.vue

@@ -229,7 +229,7 @@
 					position: fixed; 
 				    top:200upx;
 					left:0upx;
-				    z-index: 999;"></image>
+				    z-index: 999;"/>
 
 				<!-- 拖拽删除图库 -->
 				<view v-if="delete_wrap_state" class="delete-wrap" :class="{'delete-wrap-active':deleteWrap}"
@@ -240,6 +240,7 @@
 						<view>{{deleteWrap ? '松开即可删除':'拖到此处可删除'}}</view>
 					</view>
 				</view>
+				
 			</view>
 			<!-- 图片提示 -->
 			<view v-if="showone">
@@ -2889,11 +2890,9 @@
 				})
 			},
 
-	bgtextcolor() {
+	
+	  bgtextcolor() {
 		this.bg_text_color = !this.bg_text_color
-		
-	console.log(this.data)
-		console.log(this.bg_text_color)
 		this.$nextTick(() => {
 			this.$refs['textsettings'].open({
 				data: this.data,

pages/index/machineDetail.vue

@@ -245,8 +245,7 @@
 								that.$refs['switchGoods'].open(that.machine_id, isShowCustomizeData);
 							} else {
 								uni.navigateTo({
-									url: '../mall/lineUp?machine_id=' + that.machine_id +
-										'&key=' + that.key
+									url: '../mall/lineUp?machine_id=' + that.machine_id +'&key=' + that.key
 								})
 							}
 						}).catch(err => {
@@ -277,7 +276,6 @@
 					machine_id: this.machine_id,
 					s: 'machine.detail'
 				}).then(res => {
-					//console.log(res)
 					this.statusloading = 1;
 					if (res) {
 						this.list = res
@@ -286,7 +284,6 @@
 						}else{
 							this.worksid = 100211
 						}
-						
 						if(this.list.wx_flag == 1){
 							this.msg = "稍等片刻,我很快恢复"
 							this.myheadtext = '歇一歇' //头部标题栏
@@ -296,7 +293,6 @@
 							uni.hideLoading();
 						    return;
 						}
-						
 						this.toFirstCheck();
 						this.myheadtext = this.machine_id //头部标题栏
 					}
@@ -366,7 +362,6 @@
 			this.$base.machine_id = this.machine_id
 			this.statusloading = 1;
 			this.Adlist() 
-			
 			let url = "/api/material/mchineFontFamilyList";
 			let queryParam = {
 				machine_id: this.machine_id
@@ -407,6 +402,8 @@
 							complete(res) {
 								//console.log("完成")
 								textlist.long = true
+								textlist.remark = textlist.remark 
+								textlist.textlong  = true
 								that.globalData.typefacedata.forEach(item => {
 									if (item.long == true) {
 										that.globalData.num++

pages/index/mall.vue

@@ -7,7 +7,7 @@
 		<!-- 自定义头部 -->
 		<view class='flex commonHead'  style="height: 100upx;" :style="{height: titleHeight +'px'}">
 			<view class='commonHead-wrap flex'>
-				<view class='commonHead_left' @click="tomine()">
+				<!--<view class='commonHead_left' @click="tomine()">
 					<view class='commonHead_left_back'>
 						<view class="commonHead_left_back_img">
 							<image src="../../static/icon_mall_zuoshang.png" style="width: 50upx; 
@@ -15,7 +15,7 @@
 							 margin-top: 10upx; " mode="aspectFill"></image>
 						</view>
 					</view>
-				</view>
+				</view> -->
 				<view class='commonHead_right flex'>
 					<view class='commonHead_right_text line1'>色彩烘焙食品</view>
 				</view>
@@ -33,8 +33,7 @@
 			 height: 164upx; background: #FAD9B1; left: 0; right: 0; z-index: 99; border-radius: 20upx; display: flex; align-items: center;">
 				<view style="background: #FFFFFF;width: 120upx;
 					height: 120upx;border-radius: 50%; margin: 22upx 30upx;text-align: center;">
-					<image style="height: 61upx; width: 61upx;margin:32upx auto;" src="../../static/icon_saoyisao.png"
-						mode=""></image>
+					<image style="height: 61upx; width: 61upx;margin:32upx auto;" src="../../static/icon_saoyisao.png" mode=""></image>
 				</view>
 				<view style="color: #000; font-size: 36upx;">开始扫码定制</view>
 			</view>
@@ -84,13 +83,10 @@
 								style="width: 150upx; height: 143upx; margin: 0upx 21upx 0upx 0upx; border-radius: 10upx;"
 								mode="aspectFill" :src="item.image + '?x-oss-process=image/resize,lfit,w_164'"></image>
 							<view style="width: calc(100% - 281upx);">
-								
 								<view style="font-size: 34upx; font-weight: 500; color: #FFFFFF; opacity: 0.4;">
 								    {{item.id}}
 								</view>
-								
-								<view style="margin: 7upx 0 7upx; font-size: 32upx; font-weight: 500; color: #FFFFFF;
-								width: 80%; white-space: nowrap;  text-overflow: ellipsis; overflow: hidden; word-break: break-all;"
+								<view style="margin: 7upx 0 7upx; font-size: 32upx; font-weight: 500; color: #FFFFFF;width: 80%; white-space: nowrap;  text-overflow: ellipsis; overflow: hidden; word-break: break-all;"
 									:style="{opacity:item.status.value == 1 || item.status.value == 2  ? '0.4' : '0.4'}">
 									{{item.short_name || ''}}
 								</view>
@@ -154,7 +150,6 @@
 				let that = this;
 				uni.scanCode({
 					success: function(res) {
-						console.log(res)
 						if (res.scanType == 'QR_CODE') {
 							if (that.getQueryString(res.result, 'machine_id') && that.getQueryString(res
 									.result, 'machine_id') != "") {