提交

App.vue

@@ -8,7 +8,7 @@
 		},
 		onLaunch: function() {
 			// 字体列表
-			homeservice.queryList({
+			/* homeservice.queryList({
 				s: 'Material.fontFamilyList'
 			}).then(result => {
 				result.forEach(item=>{
@@ -58,7 +58,7 @@
 				})
 			}).catch(err => {
 				
-			});
+			}); */
 		},
 		onShow: function() {
 			//调用监听网络状态的方法

pages/index/index.vue

@@ -278,14 +278,9 @@
 2、关闭官方图库，要同时关掉：贴图素材、智能推荐；
 3、关闭上传相片，要同时关掉：上传相片、添加文字、添加涂鸦
 4、排队列表，没有打印中状态的，全都是排队中 -->
-
-
 <!-- 1、is_authority官方功能：手机壁纸、贴图素材、背景底色、相框形状、智能推荐
-
 2、is_photo上传图片：上传相片、添加文字、添加涂鸦
-
 3、is_recommend智能推荐：AI图像、AI画图
-
 4、is_home 返回首页：设备页不可返回首页 -->
 
 <!-- this.machine_item -->
@@ -313,9 +308,9 @@
 						<view class="tool_li_text">背景底色</view>
 					</view>
 
-					<view class="tool_li" @click="showone = !showone" v-if="is_photo == 1" >
+					<view class="tool_li" @click="showone = !showone" v-if="is_photo == 1" style="margin-bottom: 20upx;" >
 						<image @click="cancel('share')" class="tool_li_img"
-							src="../../static/icon_make_diy_back_color.png" mode=""></image>
+							src="../../static/icon_make_diy_back_color.png" mode=""  style="width: 74upx; height: 70upx;" ></image>
 						<view @click="cancel()" class="tool_li_text">上传相片</view>
 					</view>
 
@@ -580,9 +575,74 @@
 				</view>
 			</uni-popup>
 			
-			<!-- Ai转换 -->
+
+
+
+<!-- Ai转换 -->
+			<uni-popup ref="showAiChange" type="center" style="position: fixed; z-index: 9999; ">
+				<view style="height: 1000upx;border-radius:20upx; background: #fff;width: 600upx;">
+					<image src="../../static/img/icon_close_image.png" style="width: 30upx;
+					  padding: 30upx; 
+					  position: absolute; 
+					  right:0; 
+					  top:0;
+					  z-index: 999;" mode="widthFix" @click="showAiChangeClose()">
+					</image>
+					<view style="height: 240upx; padding-top: 80upx;width: 100%;
+					align-items: center;
+					display: flex;
+					flex-direction: row; 
+					justify-content: center;">
+						<view style="align-items: center;">
+							<image style="width:160upx;height:160upx;" src="../../static/icon_diy_anime_style.png"
+								@click="showAiChangeType(1)"></image>
+							<view style="width:160upx;height:130upx;text-align: center;line-height: 130upx;">动漫风格
+							</view>
+						</view>
+						<view style="align-items: center;margin-left: 100upx;">
+							<image style="width:160upx;height:160upx; " src="../../static/icon_diy_sketch_style.png"
+								@click="showAiChangeType(2)"></image>
+							<view style="width:160upx;height:130upx;text-align: center;line-height: 130upx;">素描风格
+							</view>
+						</view>
+					</view>
+					<view style="height: 240upx; padding-top: 40upx;width: 100%;
+					align-items: center;
+					display: flex;
+					flex-direction: row; 
+					justify-content: center;">
+						<view style="align-items: center;margin-left: 20upx;">
+							<image style="width:160upx;height:160upx; " src="../../static/icon_diy_matting_style.png"
+								@click="showAiChangeType(3)"></image>
+							<view style="width:160upx;height:130upx;text-align: center;line-height: 130upx;">人像抠图</view>
+						</view>
+						<view style="align-items: center;margin-left: 100upx;">
+							<image style="width:160upx;height:160upx; " src="../../static/icon_diy_enhance_style.png"
+								@click="showAiChangeType(4)"></image>
+							<view style="width:160upx;height:130upx;text-align: center;line-height: 130upx;">色彩增强</view>
+						</view>
+					</view>
+					<view style="height: 240upx; padding-top: 40upx;width: 100%;
+					align-items: center;
+					display: flex;
+					flex-direction: row; 
+					justify-content: center;">
+						<view style="align-items: center;margin-left: 20upx; width: 50%;">
+							<image style="width:160upx;height:160upx; margin: auto;"
+								src="../../static/icon_diy_matting_style.png" @click="showAiChangeType(5)"></image>
+							<view style="height:130upx;text-align: center;line-height: 130upx;">色彩超分</view>
+						</view>
+						<view style="align-items: center;margin-left: 20upx; width: 50%;">
+						</view>
+					</view>
+
+					<view style="font-size: 30upx;color:#333; width:100%;text-align: center;margin: auto;">
+						选中的图片必须带有清晰人物头像</view>
+				</view>
+			</uni-popup>
+			
 		<!-- Ai转换 -->
-		<uni-popup ref="showAiChange" type="center" style="position: fixed; z-index: 9999; ">
+		<!-- <uni-popup ref="showAiChange" type="center" style="position: fixed; z-index: 9999; ">
 			<view style="height: 950upx;border-radius:20upx; background: #fff;width: 600upx;">
 				<image src="../../static/img/icon_close_image.png" style="width: 30upx;
 				  padding: 30upx; 
@@ -627,7 +687,7 @@
 				</view>
 				<view style="font-size: 30upx;color:#333; width:100%;text-align: center;margin: auto;">选中的图片必须带有清晰人物头像</view>
 			</view>
-		  </uni-popup>
+		  </uni-popup> -->
 		  
 		  <!--Ai作画 -->
 		  <uni-popup ref="showAiMakePicture" type="center" style="position: fixed; z-index: 9999; width: 200upx">
@@ -906,7 +966,6 @@
 
 		methods: {
 			
-			
 			upLoadIImageLoadErr(e){
 				uni.showToast({
 					title: '上传失败',
@@ -1201,7 +1260,15 @@
            										});
            									} else {
            										if (result.Data) {
-           											let imageURL = result.Data.ImageURL;
+           											//let imageURL = result.Data.ImageURL;
+													
+													let imageURL;
+													if (that.selectChangeType == 5) {
+														imageURL = result.Data.Url;
+													} else {
+														imageURL = result.Data.ImageURL;
+													}
+													
            											imageURL = imageURL.replace("http:",
            												"https:")
            											if (!item.isChangeAi) {
@@ -3090,13 +3157,13 @@
 				//获取当前选中的部件
 				var item = items[index];
 				if (item != undefined && item.type == 1) {
-					item.font_family = typeface.key
+					item.font_family = typeface.title
 					item.font_dict_id = typeface.id
 				    this.data.itemList = items
 				    await this.setData({
 						data: this.data
 				    })
-					// 字体行高变化
+					//字体行高变化
 					if (typeface.title == '思源黑体') {
 						heightRate = 1.48
 					} else if (typeface.title == '字体视界法棍体') {
@@ -3110,7 +3177,7 @@
 					} else if (typeface.title == '站酷快乐体') {
 						heightRate = 1.14
 					}else{
-							heightRate = 1.4
+						heightRate = 1.4
 					}
 					var that = this;
 					var query = wx.createSelectorQuery();
@@ -3133,7 +3200,6 @@
 						})
 						that.data.itemList = items
 					}).exec()
-
 				} else {
 					uni.showToast({
 						title: '啊嘞，你还没有输入内容哦',
@@ -3177,7 +3243,7 @@
 				this.saveSnapshot();
 			},
 
-			/**
+			/*
 			 * 通过旧坐标、旋转角度、圆心计算旋转后点的新坐标
 			 * @param origin  原始坐标对象
 			 * @param center  圆心坐标对象
@@ -3185,13 +3251,11 @@
 			 * @return {{x: string, y: string}}
 			 */
 			calNewPos: function(origin, center, angle) {
-				// 计算
+				//计算
 				let radian = Math.PI / 180 * angle;
-				let newX = (origin.x - center.x) * Math.cos(radian) - (origin.y - center.y) * Math.sin(radian) + center
-					.x;
-				let newY = (origin.y - center.y) * Math.cos(radian) + (origin.x - center.x) * Math.sin(radian) + center
-					.y;
-				// 取10位小数
+				let newX = (origin.x - center.x) * Math.cos(radian) - (origin.y - center.y) * Math.sin(radian) + center.x;
+				let newY = (origin.y - center.y) * Math.cos(radian) + (origin.x - center.x) * Math.sin(radian) + center.y;
+				//取10位小数
 				newX = newX.toFixed(10);
 				newY = newY.toFixed(10);
 				return {
@@ -3200,7 +3264,7 @@
 				};
 			},
 
-			/**
+			/*
 			 * 通当新坐标、旋转角度、圆心计算旋转后点的旧坐标
 			 * @param origin  原始坐标对象
 			 * @param center  圆心坐标对象
@@ -3208,13 +3272,11 @@
 			 * @return {{x: string, y: string}}
 			 */
 			calOldPos: function(origin, center, angle) {
-				// 计算
+				//计算
 				let radian = -Math.PI / 180 * angle;
-				let oldX = (origin.x - center.x) * Math.cos(radian) - (origin.y - center.y) * Math.sin(radian) + center
-					.x;
-				let oldY = (origin.y - center.y) * Math.cos(radian) + (origin.x - center.x) * Math.sin(radian) + center
-					.y;
-				// 取10位小数
+				let oldX = (origin.x - center.x) * Math.cos(radian) - (origin.y - center.y) * Math.sin(radian) + center.x;
+				let oldY = (origin.y - center.y) * Math.cos(radian) + (origin.x - center.x) * Math.sin(radian) + center.y;
+				//取10位小数
 				oldX = oldX.toFixed(10);
 				oldY = oldY.toFixed(10);
 				return {
@@ -3222,9 +3284,9 @@
 					y: oldY
 				};
 			},
-			/**
+			
+			/*
 			 * 计算伸缩后的四个顶部坐标
-			 *
 			 * @param scale  放大倍部
 			 * @param left   左上顶点的左距离
 			 * @param top    左上顶点的上距离
@@ -3264,9 +3326,9 @@
 					centerY: (rightTopY - leftTopY) / 2
 				};
 			},
-			/**
+			
+			/*
 			 * 计算未伸缩时的四个顶点坐标
-			 *
 			 * @param left   左上顶点的左距离
 			 * @param top    左上顶点的上距离
 			 * @param width  部件宽度
@@ -3300,7 +3362,8 @@
 					centerY: (rightTopY - leftTopY) / 2
 				};
 			},
-			/**
+			
+			/*
 			 * 计算四个顶点旋转后的坐标系
 			 * @param scalePos  四个顶点未旋转前的坐标系
 			 * @param center    中心点位置
@@ -3342,7 +3405,8 @@
 					centerY: (scalePos.rightTopY - scalePos.leftTopY) / 2
 				};
 			},
-			/**
+			
+			/*
 			 * 计算四个顶点旋转后的旧坐标
 			 * @param scalePos  四个顶点未旋转前的坐标系
 			 * @param center    中心点位置
@@ -3384,7 +3448,8 @@
 					centerY: (rightTopY - leftTopY) / 2
 				};
 			},
-			// 读取图片操作
+			
+			//读取图片操作
 			loadImage(e) {
 				var id = e.currentTarget.dataset.id;
 				var width = e.detail.width * this.data.pixelRate * this.design_widthrate; //获取图片真实宽度
@@ -3393,7 +3458,8 @@
 				items[id - 1]['height'] = height / rScale;
 				items[id - 1]['top'] = items[id - 1]['y'] - (items[id - 1]['height'] / 2);
 			},
-			/* 部件点击事件 */
+			
+			/*部件点击事件 */
 			itemClick(e) {
 				this.isShowGif = false;
 				// 循环数据找到点击点
@@ -3421,7 +3487,8 @@
 				// 初始化的位置
 				drag.initPos(items[index])
 			},
-			/** 点击画布区域取消聚焦 */
+			
+			/*点击画布区域取消聚焦 */
 			itemCancel(e) {
 				this.isShowGif = false;
 				if (items.length > 0) {
@@ -3440,30 +3507,33 @@
 					this.active = false
 				}
 			},
-			/* 获取编辑区域左边距 */
+			
+			/*获取编辑区域左边距 */
 			getLeft: function() {
 				//return this.data.bgWidth * 0.3;
 				// return 235 * this.data.pixelRate;
 				return (750 - this.design_width) / 2 * this.data.pixelRate;
 			},
-			/* 获取编辑区域上边距 */
+			
+			/*获取编辑区域上边距 */
 			getTop: function() {
 				// return this.data.bgHeight * 0.25;
 				return (this.data.bgHeight - this.data.editorHeight) / 2;
 			},
-			/* 图片拖动开始事件 */
+			
+			/*图片拖动开始事件 */
 			dragStart: function(e) {
-				// 剪切数据
+				//剪切数据
 				this.properties = items[index]
-				// 点击选中部件
+				//点击选中部件
 				this.itemClick(e);
-				// 获取当前选中的部件
+				//获取当前选中的部件
 				var item = items[index];
 				if (e.touches.length > 1) {
 					//获取作为移动前角度的坐标
 					item.touchX = e.touches[0].clientX;
 					item.touchY = e.touches[0].clientY;
-					// 当两根手指放上去的时候，将距离(distance)初始化。
+					//当两根手指放上去的时候，将距离(distance)初始化。
 					let xMove = e.touches[1].clientX - e.touches[0].clientX;
 					let yMove = e.touches[1].clientY - e.touches[0].clientY;
 					//计算开始触发两个手指坐标的距离
@@ -3471,7 +3541,7 @@
 					//获取图片半径
 					item.r = this.computeDistance(item.x, item.y, item.left, item.top);
 				} else {
-					// 记录点击时的坐标值
+					//记录点击时的坐标值
 					item.startX = e.touches[0].clientX;
 					item.startY = e.touches[0].clientY;
 				}
@@ -3479,18 +3549,17 @@
 				if (item.type == 1) {
 					currentText = item.content;
 				}
-
 				item.mLeft = item.left;
 				item.mTop = item.top;
 				drag.recordPressDownData(item);
-
 				//赋值
 				this.data.listActive = true
 				this.data.cidx = index
 				this.data.currentText = currentText
 				this.data.itemList = items
 			},
-			/* 图片拖动中事件 */
+			
+			/*图片拖动中事件 */
 			dragMove: function(e) {
 				// 获取当前选中的部件
 				var item = items[index];
@@ -3529,7 +3598,8 @@
 				}
 				this.data.itemList = items //赋值就移动了
 			},
-			/* 拖动结束事件 */
+			
+			/*拖动结束事件 */
 			dragEnd: function(e) {
 				//赋值
 				this.guide_top = false
@@ -3558,7 +3628,8 @@
 				// this.data.listActive = false
 				this.saveSnapshot();
 			},
-			/* 部件缩放开始事件*/
+			
+			/*部件缩放开始事件*/
 			scaleStart(e, type) {
 				this.itemClick(e); // 点击选中部件
 				var item = items[index]; // 获取当前选中的部件

pages/index/machineDetail.vue

@@ -38,13 +38,14 @@
 			<view v-if="statusloading == 2" style="min-height: 100%;background: #131319 !important;">
 				<view class="start" style="padding-bottom: 100upx; padding-top: 200upx;">
 					<image src="../../static/icon_guaqi.png" mode="aspectFill" class="start_img"></image>
+					<view class="start_text" style="margin-top: -80upx;font-size: 31upx;">{{machine_id || ''}}</view>
 					<view class="start_text">{{msg || ''}}</view>
 					<view @click="tomakePhoneCall">
 						<view class="start_text">联系客服</view>
 						<view class="start_text" style="display: flex; justify-content: center; align-items: center;">
 							<image src="../../static/phone.png" mode=""
 								style="width: 32upx; height: 32upx; margin-right: 5upx;"></image>
-							{{phone || '18938664545'}}
+							{{phone || ''}}
 						</view>
 					</view>
 				</view>
@@ -66,7 +67,7 @@
 			<image src="../../static/liebiao.png" mode="" style="width: 243upx; height: 123upx;"></image>
 		</view>
 		
-		<view @click="toProxyApplet()" v-if="list.is_open_manage == 1"
+		<view @click="toProxyApplet()" v-if="list.is_open_manage == 1 && statusloading == 1"
 			 style="position: fixed; z-index: 99; right: 0; bottom: 280upx; display: flex;align-items: center;justify-content: center;width: 100upx; height: 88upx; background: #47e5e5; border-radius: 44upx 0px 0px 44upx;">
 			<view style="font-size: 24upx; font-weight: 800; color: #FFFFFF;">
 				<view>运营</view>
@@ -108,12 +109,16 @@
 				msg: null,
 				worksid: 1,
 				statusloading: null, //加载状态
-				phone: '18938664545',
+				phone: '',
 				goods: [], //商品列表
 				currentIndex: 0,
 				selectItem: null, //选择对象
 				name: "",
-				show_admin_login: 0
+				show_admin_login: 0,
+				globalData: {
+					typefacedata: [],
+					num: 0
+				},
 			};
 		},
 
@@ -195,7 +200,7 @@
 					mask: true
 				})
 				uni.makePhoneCall({
-					phoneNumber: this.phone || '18938664545', //仅为示例
+					phoneNumber: this.phone || '', //仅为示例
 					success(res) {
 						uni.hideLoading();
 					},
@@ -258,6 +263,15 @@
 						}else{
 							this.worksid = 100211
 						}
+						if(this.list.wx_flag == 1){
+							this.msg = "稍等片刻,我很快恢复"
+							this.myheadtext = '歇一歇' //头部标题栏
+							this.statusloading = 2
+							this.phone = this.list.shop.tel
+							uni.stopPullDownRefresh();
+							uni.hideLoading();
+						    return;
+						}
 						this.toFirstCheck();
 						this.myheadtext = this.machine_id//头部标题栏
 					}
@@ -326,6 +340,63 @@
 			this.statusloading = 1;
 			this.Adlist() //轮播图
 			this.getDetail() //获取数据
+			
+			let url = "/api/material/mchineFontFamilyList";
+			let queryParam = {
+				machine_id: this.machine_id
+			}
+			var that = this;
+			this.$http.post(url, queryParam).then(result => {
+			        var dataList = result.data;						
+					dataList.forEach(item => {
+						item.long = false
+						item.textlong = null
+					})
+					dataList.unshift({
+						id: 0,
+						key: "SourceHanSansCN-Normal",
+						remark: "",
+						title: "思源黑体",
+						textlong: true,
+						long: true
+					})
+					this.globalData.typefacedata = dataList
+					this.$base.typefacedata = this.globalData.typefacedata
+					let t1 = new Date().getTime();
+					let that = this
+					this.globalData.typefacedata.forEach(textlist => {
+						uni.loadFontFace({
+							global: true,
+							family: textlist.title,
+							source: 'url(' + textlist.remark + ')',
+							desc: {
+								weight: 100
+							},
+							success: function(success) {
+								textlist.textlong = true
+							},
+							fail: function(fail) {
+								textlist.textlong = false
+							},
+							complete(res) {
+								//console.log("完成")
+								textlist.long = true
+								that.globalData.typefacedata.forEach(item => {
+									if (item.long == true) {
+										that.globalData.num++
+									}
+								})
+								that.$base.typefacedata = that.globalData.typefacedata
+								if (that.globalData.num == that.globalData.typefacedata.length) {
+					
+								}
+								that.globalData.num = 0
+							 }
+						   })
+					   })
+			     }).catch(err => {
+				   //uni.hideLoading();
+			    });
 		},
 
 		onShow() {},

pages/index/mall.vue

@@ -88,7 +88,6 @@
 								<view style="font-size: 36upx; font-weight: 500; color: #FFFFFF; opacity: 0.4;">
 									{{item.id}}
 								</view>
-								
 								<view style="margin: 5upx 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'}">

pages/index/textsettings.vue

@@ -27,7 +27,7 @@
 					<view
 						style="width: 601upx; height: 57upx; background: rgb(255,255,255,0.1); margin: 21upx 41upx 21upx 21upx; border-radius: 10upx;">
 						<input :fixed="true" :auto-height="true" :show-confirm-bar="false" :cursor-spacing="73"
-							:adjust-position="false" type="text" maxlength="20" @input="textInput"
+							:adjust-position="false" type="text" maxlength="35" @input="textInput"
 							v-model="data.currentText" @focus="focusTextarea" @blur="blurTextarea"
 							placeholder="请输入文字内容..."
 							style="font-size: 34upx; font-weight: 400; height: 57upx; line-height: 57upx; padding: 0upx 0 0upx 20upx; color: #FFFFFF;" />
@@ -63,8 +63,8 @@
 					style="display: flex; height: 90upx; padding: 38upx 0 41upx; align-items: center;">
 
 					<!-- 颜色 开始-->
-					<scroll-view style="box-sizing: border-box; white-space: nowrap;
-				  margin-left: 35upx; margin-right: 35upx;margin-bottom: 30upx; margin-top: 40upx; width: calc(100% - 70upx);"
+					<scroll-view style="box-sizing: border-box; white-space: nowrap; margin-left: 35upx; 
+					margin-right: 35upx;margin-bottom: 30upx; margin-top: 40upx; width: calc(100% - 70upx);"
 						scroll-x scroll-with-animation>
 						<view style="text-align: center; display: inline-block; padding-left: 20upx;"
 							v-for="(item,index) in colorList" :key="index" @click.stop="workcolor(item.color)">
@@ -87,12 +87,11 @@
 				</view>
 				<view v-if="!show" style="position: absolute; bottom: 100upx; width: 100%; background: #292933;">
 					<!-- 修改 -->
-					<view v-if="text == 'modify'" style="display: flex;align-items: center; justify-items: center; border-bottom: 1upx solid #000000;
-				height: 99upx;">
+					<view v-if="text == 'modify'" style="display: flex;align-items: center; justify-items: center; border-bottom: 1upx solid #000000;height: 99upx;">
 						<view
 							style="width: 710upx; height: 57upx; background: rgb(255,255,255,0.1); margin: 20upx 40upx 20upx 20upx; border-radius: 10upx;">
 							<input :fixed="true" :auto-height="true" :show-confirm-bar="false" :cursor-spacing="73"
-								:adjust-position="false" type="text" maxlength="32" @input="textInput"
+								:adjust-position="false" type="text" maxlength="35" @input="textInput"
 								v-model="data.currentText" @focus="focusTextarea" @blur="blurTextarea"
 								placeholder="请输入文字内容..."
 								style="font-size: 34upx; font-weight: 400; height: 57upx; line-height: 57upx; padding: 0upx 0 0upx 20upx; color: #FFFFFF;" />

util/script.js

@@ -37,6 +37,14 @@ function callRecognizeBankCard(imageURL, miniProgramType, type, callback) {
 		request_["ImageURL"] = imageURL;
 		request_["Mode"] = "ln17_256";
 		request_["OutputFormat"] = "png";
+	}else if (type == 5) { //图像超分
+			request_["Url"] = imageURL;
+			Action = "MakeSuperResolutionImage";
+			endpoint = "imageenhan.cn-shanghai.aliyuncs.com";
+			API_VERSION = "2019-09-30";
+		    request_["Mode"] = "enhancement";
+			request_["UpscaleFactor"] = "4";
+			request_["OutputQuality"] = "100";
 	} else {
 		request_["AlgoType"] = "handdrawn";
 	}