提交

pages.json

@@ -4,8 +4,13 @@
 			"style": {
 				"navigationBarTitleText": "",
 				"enablePullDownRefresh": true,
-				"navigationStyle": "custom"
+				"navigationStyle": "custom" //禁用uni-app默认的头部导航
 			}
+			/* "style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": true,
+				"navigationStyle": "custom"
+			} */
 		},
 		{
 			"path": "pages/index/machineDetail",

pages/index/index.vue

@@ -38,7 +38,7 @@
 						style="border-left: 1px dashed #43cf7c;position: absolute; height: 100%; z-index: 999;"
 						:style="{left: ((data.bgWidth / 2) - 0.5) +'px'}"></view>
 					<view v-if="guide_top"
-						style="width: 100%; border-top: 1px dashed #43cf7c;position: absolute; z-index: 999;"
+						style="width: 100%; border-top: 1px dashed #47e5e5;position: absolute; z-index: 999;"
 						:style="{top: (editory + (data.editorHeight * location_scale - 0.5)) +'px'}"></view>
 					<!-- 主干 -->
 					<view :class="['item-list', { 'list-active': data.listActive == true }]"
@@ -260,7 +260,7 @@
 						style="text-align: center; font-size: 28upx; font-weight: 500; color: #333333; line-height: 45upx; margin-top: 62upx;">
 						请选择手机拍摄或尺寸较大的图片<br>以体验最佳冲印效果
 					</view>
-					<view @click="selectPicturePop()" style="width: 466upx; height: 82upx; background: #F29F3D; border-radius: 10upx; font-size: 36upx; font-weight: 400; 
+					<view @click="selectPicturePop()" style="width: 466upx; height: 82upx; background: #47e5e5; border-radius: 10upx; font-size: 36upx; font-weight: 400; 
 					  color: #FFFFFF; text-align: center; line-height: 82upx; margin: 46upx auto 46upx; ">好的</view>
 				</view>
 			</view>
@@ -274,6 +274,11 @@
 				</view>
 			</view>
 
+<!-- 1、增加在线定制站、正在休息-》体验中；
+2、关闭官方图库，要同时关掉：贴图素材、智能推荐；
+3、关闭上传相片，要同时关掉：上传相片、添加文字、添加涂鸦
+4、排队列表，没有打印中状态的，全都是排队中 -->
+
 			<!-- 菜单栏目  -->
 			<view v-if="!active && !guide_left" class="toolRight">
 				<view class="tool_li">
@@ -283,12 +288,12 @@
 						<view class="tool_li_text">历史作品</view>
 					</view>
 
-					<view class="tool_li" @click="showPopup(23)">
+					<view class="tool_li" @click="showPopup(23)" v-if="is_public == 1">
 						<image class="tool_li_img" src="../../static/icon_diy_wallpaper.png" mode=""></image>
 						<view class="tool_li_text">全幅壁纸</view>
 					</view>
 
-					<view class="tool_li" @click="showPopup(2)">
+					<view class="tool_li" @click="showPopup(2)" v-if="is_public == 1">
 						<image class="tool_li_img" src="../../static/icon/icon_stickers.png" mode=""></image>
 						<view class="tool_li_text">贴图素材</view>
 					</view>
@@ -298,32 +303,31 @@
 						<view class="tool_li_text">背景底色</view>
 					</view>
 
-					<view class="tool_li" @click="showone = !showone">
+					<view class="tool_li" @click="showone = !showone" v-if="diy_upload_menu == 1">
 						<image @click="cancel('share')" class="tool_li_img"
 							src="../../static/icon_make_diy_back_color.png" mode=""></image>
 						<view @click="cancel()" class="tool_li_text">上传相片</view>
 					</view>
 
-					<view class="tool_li" @click="showPopup(3)">
+					<view class="tool_li" @click="showPopup(3)" v-if="diy_upload_menu == 1">
 						<image class="tool_li_img" src="../../static/icon_diy_typeface.png"
 							style="width: 45upx; height: 40upx;" mode=""></image>
 						<view @click="cancel()" class="tool_li_text">添加文字</view>
 					</view>
 
-					<view class="tool_li" @click="ontuya()" v-if="machine_id">
+					<view class="tool_li" @click="ontuya()"v-if="diy_upload_menu == 1" >
 						<image class="tool_li_img" style="width: 62upx; height: 55upx;" src="../../static/icon_tuya.png"
 							mode=""></image>
 						<view class="tool_li_text">添加涂鸦</view>
 					</view>
 
-					<view class="tool_li" @click="wallpaperOnclick()" v-if="machine_id">
+					<view class="tool_li" @click="wallpaperOnclick()" v-if="is_pubilc == 1">
 						<image class="tool_li_img" style="width: 71upx; height: 59upx;"
 							src="../../static/randomwallpaper.png" mode=""></image>
 						<view class="tool_li_text">智能推荐</view>
 					</view>
 
 		          <!-- AI图像 -->
-		
 				    <view class="tool_li" @click.stop='showAiChange()'>
 					  <image class="tool_li_img" style="width: 51upx; height: 38upx;"
 						src="../../static/icon_diy_ai.png" mode=""></image>
@@ -336,7 +340,6 @@
 						<view class="tool_li_text">AI画图</view>
 					</view>
 
-
 					<view class="tool_li" @click.stop="removedeleteItem" v-if="data.itemList.length > 0">
 						<image class="tool_li_img" style="width: 50upx; height: 50upx;"
 							src="../../static/diy_icon_middle_default.png" mode=""></image>
@@ -666,7 +669,6 @@
 		  	</view>
 		  </uni-popup>
 		
-
 			<switchGoods ref="switchGoods" @selectGoodItem="selectGoodItem"></switchGoods>
 			<!--商品弹框 -->
 
@@ -877,6 +879,8 @@
 				activeRadio: '现代风', //存的是单选按钮选中的value值
 				radioGroup: ['现代风', '卡通风', '铅笔画风'],
 				upLoadImageUrl: "", //上传图片地址
+				diy_upload_menu:0,
+				is_public:0
 			};
 		},
 
@@ -2060,13 +2064,25 @@
 							machine_id: this.machine_id
 						}).then(res => {
 							that.machine_item = res
+							
+							console.log(res)
+							
 							//判断配送版
 							if (res.delivery == 1 && res.machine_category_id == "64") {
 								//this.key = 1;
 								this.isComeDelivery = true;
 							} //key:null,//1直营配送站 2 万能通用版 3色彩自助站
 
-							this.support_pay = res.support_pay //单机版是否支付
+
+	                        this.machine_item = res
+							//that.diy_upload_menu = that.machine_item.diy_upload_menu
+							//that.support_pay = res.support_pay //单机版是否支付
+							//that.is_public = res.is_public
+		                    this.diy_upload_menu = res.diy_upload_menu;
+							this.is_public = res.is_public;
+							this.support_pay = res.support_pay
+							
+						
 							// 先登陆
 							uni.login({
 								provider: 'weixin',
@@ -4352,6 +4368,24 @@
 					that.goodslist() // 获取产品详情数据
 				}
 			})
+			
+			
+			homeservice.WorksList({
+				s: 'machine.detail',
+				machine_id: this.machine_id
+			}).then(res => {
+				this.machine_item = res
+			    this.diy_upload_menu = res.diy_upload_menu;
+				this.is_public = res.is_public;
+				this.support_pay = res.support_pay
+				console.log(this.diy_upload_menu);
+				console.log(this.is_public);
+			}).catch(err => {
+				uni.showToast({
+					title: err.msg,
+					icon: 'none'
+				});
+			});
 		},
 
 		onShow() {
@@ -4786,28 +4820,25 @@
 
 		.tool_add {
 			width: 207upx;
-			background: #F29F3D;
+			background: #47e5e5;
 			line-height: 98upx;
 			text-align: center;
 			color: #FFFFFF;
-
 			box-shadow: 0upx 0upx 16upx 0upx rgba(0, 0, 0, 0.08);
 			border-radius: 49upx 50upx 0upx 49upx;
-
 			font-size: 36upx;
 			font-weight: 500;
 			color: #FFFFFF;
 			margin-left: auto;
-			/* 	box-shadow: 0 0 16upx 0 rgba(0, 0, 0, 0.08);
-			border-radius: 60upx 0 0 5upx; */
 		}
 
 		.grey {
 			background: #8F8F94 !important;
 		}
+		
 	}
 
-	// 底部工具栏
+	//底部工具栏
 	.tool {
 		position: fixed;
 		bottom: 0;
@@ -4838,7 +4869,7 @@
 
 		.tool_add {
 			width: 210upx;
-			background: #F56364;
+			background: #47e5e5;
 			line-height: 160upx;
 			text-align: center;
 			color: #FFFFFF;

pages/index/machineDetail.vue

@@ -16,7 +16,7 @@
 				</swiper>
 				<view style="position: fixed; bottom: 60upx; text-align: center;left: 0; right: 0;">
 					<view class="dots">
-						<view v-for="(item, index) in Adlists" class="dot-wrapper" :key="index">
+						<view v-for="(item, index) in Adlists" class="dot-wrapper" :key="index" >
 							<image v-if="index == currentSwiper" src="../../static/icon_banner_dot.png"
 								style="width: 15upx; height: 15upx; margin-left: 10upx;"></image>
 							<image else src="../../static/icon_banner_select_dot.png"
@@ -27,17 +27,13 @@
 
 				<view @click="Customize_now" hover-class="hover-class-bg" style="position: fixed; bottom: 130upx; left: 0; right: 0; margin: auto;
 				width: 300upx; height: 100upx; 
-				background: linear-gradient(92deg, #F29F3D, #F29F3D);
+				background: linear-gradient(92deg, #47e5e5, #47e5e5);
 				box-shadow: 0px 19px 48px 1px rgba(20, 31, 62, 0.35);
 				border-radius: 40px;">
 					<view
 						style=" text-align: center; line-height: 100upx; font-size: 36upx; font-weight: 500; color: #FFFFFF;">
 						立即定制</view>
 				</view>
-
-			<!-- 	<view @click="toProxyApplet()" v-if="list.is_open_manage == 1"
-					style="position: fixed; bottom: 35upx; text-align: center;left: 0; right: 0;font-size: 32upx; margin: auto; color: #fff;">
-					运营中心</view> -->
 			</view>
 
 			<!-- 错误提示信息 -->
@@ -73,14 +69,13 @@
 		
 		<view @click="toProxyApplet()" v-if="list.is_open_manage == 1"
 			style="position: fixed; z-index: 99; right: 0; bottom: 280upx; display: flex;align-items: center;justify-content: center;
-		width: 100upx; height: 88upx; background: #F29F3D; border-radius: 44upx 0px 0px 44upx;">
+		  width: 100upx; height: 88upx; background: #47e5e5; border-radius: 44upx 0px 0px 44upx;">
 			<view style="font-size: 24upx; font-weight: 800; color: #FFFFFF;">
 				<view>运营</view>
 				<view>中心</view>
 			</view>
 		</view>
 
-
 		<switchGoods ref="switchGoods" @selectGoodItem="selectGoodItem"></switchGoods>
 		<!--//商品弹框 -->
 	</view>
@@ -278,7 +273,7 @@
 					if (res) {
 						this.list = res;
 						this.toFirstCheck();
-						this.myheadtext = this.machine_id + '-' + res.code //头部标题栏
+						this.myheadtext = this.machine_id//头部标题栏
 					}
 					uni.stopPullDownRefresh();
 					uni.hideLoading();

pages/index/switchGoods.vue

@@ -3,7 +3,7 @@
 		style=" position: absolute;  top: 0; width: 100%; height: 100%; display: flex; flex-direction: column;  "
 		@click="closeView()">
 
-		<view style="position: absolute;  top: 0; width: 100%; height: 100%; background: #999999; z-index: 999; opacity: 0.5;  "></view>
+		<view style="position: absolute;  top: 0; width: 100%; height: 100%; background: #999999; z-index: 999; opacity: 0.5;"></view>
 
 		<view style=" position: absolute;
 			top: calc(50% - 420upx); 
@@ -15,23 +15,6 @@
 			justify-content: center; 
 			z-index: 999;">
 			
-			<!-- <scroll-view scroll-y scroll-with-animation style="box-sizing: border-box;white-space: nowrap;
-			width: 700upx; margin:0 auto; overflow: hidden; height: 100%;">
-				<view v-for="(item,index) in goods" :key="index" @click="goodclick(item)">
-					<view style="float: left; margin: 10upx;
-				display: flex;align-items: center;
-				background: #fff;border-radius: 15upx; position: relative;
-				height: 300upx; width: 210upx;" hover-class="brandactive" :class="[brandtext == item.title ? 'brandactive':'' ]">
-						<image mode="widthFix" style="width:calc(100% - 60upx);margin: auto;"
-							:src="item.goods_pic + '?x-oss-process=image/resize,lfit,w_700'"></image>
-						<view style="text-align: center; font-size: 24upx; width: 100%; 
-							color:#333; position: absolute; bottom: 20upx; ">
-							{{item !=null ? item.name : ''}}
-						</view>
-					</view>
-				</view>
-			</scroll-view> -->
-
 			<swiper class="swiper-block" :indicator-dots="false" :autoplay="false" :interval="3000" :duration="1000"
 				circular='false' previous-margin='80rpx' next-margin='80rpx' :current="currentIndex"
 				@change="swiperChangeGood">
@@ -43,10 +26,13 @@
 							mode="widthFix">
 						</image>
 					</view>
-					<view
-						style="width: 100%;font-size: 28upx;color: #333333;text-align: center; position: absolute; bottom: 100upx; z-index: 999;  ">
+					<view style="width: 100%;font-size: 28upx;color: #333333;text-align: center; position: absolute; bottom: 100upx; z-index: 999;">
 						{{item !=null ? item.name : ''}}
 					</view>
+					<!-- <view @click="cutom"
+					style="width: 100%;font-size: 32upx;color: #5CE6B5;text-align: center; position: absolute; bottom: 35upx; z-index: 999;">
+						自定义尺寸
+					</view> -->
 				</swiper-item>
 			</swiper> 
 		</view>
@@ -162,7 +148,7 @@
 	}
 
 	.slide-image {
-		height: calc(100% - 100upx);
+		height: calc(100% - 90upx);
 		width: 520upx;
 		border-radius: 20upx;
 		z-index: 1;

util/Env.js

@@ -18,7 +18,7 @@ const Env = {
 	getBaseURL: () => baseURL,
 	getmachineId: () => '100055', //线上111001
 	getappcode: () => 'lite',
-	getmalltext: () => "色彩公园Lite",
+	getmalltext: () => "色彩小商品",
 	getAppID: () => "wx1c777ee874c39b0b",
 	getcompany: () => "深圳市瑞丰彩科技有限公司",
 	//跳转--色彩小程序