浏览代码

新增艺术照tab前提交

李万涛 1 年之前
父节点
当前提交
ed3733ad84

+ 9 - 1
common/config.js

xqd
@@ -1,3 +1,11 @@
+if (process.env.NODE_ENV === 'development') {
+	var baseImgUrl = 'https://t3.scxxq.cn/index.php/api.common/upload?uniacid=' + uni.getStorageSync('uniacid') || 5059
+} else {
+	var baseImgUrl = 'https://t3.scxxq.cn/index.php/api.common/upload?uniacid=' + uni.getStorageSync('uniacid') || 5059
+	// var baseImgUrl = 'https://nywhcm.com/addons/wike_aging/public/index.php/api.common/upload?uniacid=' + uni
+	// 	.getStorageSync('uniacid') || 5059
+}
+
 module.exports = {
-	baseImgUrl: 'https://meta.swdz.com/index.php/api.common/upload?uniacid=5059'
+	baseImgUrl
 }

+ 8 - 2
common/request/request.js

xqd
@@ -32,9 +32,15 @@ if (process.env.NODE_ENV === 'development') {
 } else {
 	var siteInfo = {
 		uniacid: uni.getStorageSync('uniacid') || 5059,
-		siteroot: "https://nywhcm.com/addons/wike_aging/public/index.php/",
-		root: "https://nywhcm.com/addons/wike_aging/public/",
+		// siteroot: "https://meta.swdz.com/index.php/",
+		siteroot: "https://t3.scxxq.cn/index.php/",
+		root: "https://t3.scxxq.cn/",
 	};
+	// var siteInfo = {
+	// 	uniacid: uni.getStorageSync('uniacid') || 5059,
+	// 	siteroot: "https://nywhcm.com/addons/wike_aging/public/index.php/",
+	// 	root: "https://nywhcm.com/addons/wike_aging/public/",
+	// };
 }
 
 

+ 5 - 2
components/wike-tabbar/wike-tabbar.vue

xqd
@@ -6,15 +6,18 @@
 				<view class="action tabbar-item" :style="{color:index==currTabIndex?'#207cf7':''}"
 					@click="clickTab(item,index)">
 					<block v-if="item.showType=='img'">
+						<!-- <image :style="{marginRight:item.text=='提问'?'50rpx':''}" class="tabbar-icon"
+							:src="index==currTabIndex? item.selectedIconPath : item.iconPath">
+						</image> -->
 						<image class="tabbar-icon" :src="index==currTabIndex? item.selectedIconPath : item.iconPath">
 						</image>
 					</block>
 					<block v-if="item.showType=='iconfont'">
 						<view :class="['tabbar-icon',item.fontClass]"
-							:style="{'color':index==currTabIndex?'#207cf7':'','font-size':item.text=='应用'?'26px':'22px'}">
+							:style="{'color':index==currTabIndex?'#207cf7':'','font-size':item.text=='应用'?'26px':'22px',marginTop:item.text=='应用'?'-3px':'',marginBottom:item.text=='应用'?'5px':''}">
 						</view>
 					</block>
-					<view class="tabbar-text">{{ item.text }}</view>
+					<view class="tabbar-text" :style="{marginLeft:item.text=='提问'?'-8rpx':''}">{{ item.text }}</view>
 					<view class="tabbar-item-num" v-if="item.num">{{item.num}}</view>
 				</view>
 			</block>

+ 96 - 96
manifest.json

xqd
@@ -1,97 +1,97 @@
 {
-	"name": "AI智能问答机器人",
-	"appid": "__UNI__CE99D9E",
-	"description": "",
-	"versionName": "1.0.0",
-	"versionCode": "100",
-	"transformPx": false,
-	/* 5+App特有相关 */
-	"app-plus": {
-		"usingComponents": true,
-		"nvueStyleCompiler": "uni-app",
-		"compilerVersion": 3,
-		"splashscreen": {
-			"alwaysShowBeforeRender": true,
-			"waiting": true,
-			"autoclose": true,
-			"delay": 0
-		},
-		/* 模块配置 */
-		"modules": {},
-		/* 应用发布信息 */
-		"distribute": {
-			/* android打包配置 */
-			"android": {
-				"permissions": [
-					"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-					"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-					"<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-					"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.CAMERA\"/>",
-					"<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
-					"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-					"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-					"<uses-feature android:name=\"android.hardware.camera\"/>",
-					"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
-				]
-			},
-			/* ios打包配置 */
-			"ios": {},
-			/* SDK配置 */
-			"sdkConfigs": {}
-		}
-	},
-	/* 快应用特有相关 */
-	"quickapp": {},
-	/* 小程序特有相关 */
-	"mp-weixin": {
-		"appid": "wx98ab2939999e13de",
-		"setting": {
-			"urlCheck": false,
-			"es6": true,
-			"minified": true,
-			"postcss": true
-		},
-		"usingComponents": true,
-		"permission": {}
-	},
-	"mp-alipay": {
-		"usingComponents": true
-	},
-	"mp-baidu": {
-		"usingComponents": true
-	},
-	"mp-toutiao": {
-		"usingComponents": true
-	},
-	"uniStatistics": {
-		"enable": false
-	},
-	"optimization": {
-		"subPackages": true
-	},
-	"vueVersion": "2",
-	"h5": {
-		"router": {
-			"mode": "history",
-			"base": "/addons/wike_aging/public/h5/"
-		},
-		"title": "",
-		"devServer": {
-			"https": false
-		},
-		"template": "template.h5.html",
-		"sdkConfigs": {
-			"maps": {
-				"qqmap": {
-					"key": "EDJBZ-G5CCP-RCNDN-VROAR-KDCV2-J5FK4"
-				}
-			}
-		}
-	}
-}
+    "name" : "AI智能问答机器人",
+    "appid" : "__UNI__CE99D9E",
+    "description" : "",
+    "versionName" : "1.0.0",
+    "versionCode" : "100",
+    "transformPx" : false,
+    /* 5+App特有相关 */
+    "app-plus" : {
+        "usingComponents" : true,
+        "nvueStyleCompiler" : "uni-app",
+        "compilerVersion" : 3,
+        "splashscreen" : {
+            "alwaysShowBeforeRender" : true,
+            "waiting" : true,
+            "autoclose" : true,
+            "delay" : 0
+        },
+        /* 模块配置 */
+        "modules" : {},
+        /* 应用发布信息 */
+        "distribute" : {
+            /* android打包配置 */
+            "android" : {
+                "permissions" : [
+                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+                ]
+            },
+            /* ios打包配置 */
+            "ios" : {},
+            /* SDK配置 */
+            "sdkConfigs" : {}
+        }
+    },
+    /* 快应用特有相关 */
+    "quickapp" : {},
+    /* 小程序特有相关 */
+    "mp-weixin" : {
+        "appid" : "wx98ab2939999e13de",
+        "setting" : {
+            "urlCheck" : false,
+            "es6" : true,
+            "minified" : true,
+            "postcss" : true
+        },
+        "usingComponents" : true,
+        "permission" : {}
+    },
+    "mp-alipay" : {
+        "usingComponents" : true
+    },
+    "mp-baidu" : {
+        "usingComponents" : true
+    },
+    "mp-toutiao" : {
+        "usingComponents" : true
+    },
+    "uniStatistics" : {
+        "enable" : false
+    },
+    "optimization" : {
+        "subPackages" : true
+    },
+    "vueVersion" : "2",
+    "h5" : {
+        "router" : {
+            "mode" : "history",
+            "base" : "/h5/"
+        },
+        "title" : "",
+        "devServer" : {
+            "https" : false
+        },
+        "template" : "template.h5.html",
+        "sdkConfigs" : {
+            "maps" : {
+                "qqmap" : {
+                    "key" : "EDJBZ-G5CCP-RCNDN-VROAR-KDCV2-J5FK4"
+                }
+            }
+        }
+    }
+}

+ 2 - 2
pages/employee/index.vue

xqd xqd
@@ -17,7 +17,7 @@
 			</div>
 
 			<div class="t1">
-				{{!userInfo.robot_is_login?'使用微信扫码登录机器人':userInfo.name}}
+				{{!userInfo.robot_is_login?'使用微信扫码登录机器人':userInfo.nickname}}
 
 			</div>
 			<div class="t2" :style="{color:!userInfo.robot_is_login?'':'#237FED'}">
@@ -40,7 +40,7 @@
 				style="margin-top: 100rpx;margin-left: 50%;transform: translateX(-50%);width: 250rpx;height: 250rpx;"
 				src="@/static/success.png" alt="" />
 
-			<div class="fresh">
+			<div class="fresh" v-if="!userInfo.robot_is_login">
 				<span>刷新</span>
 				<image @click="fresh" ref="hyh" id="img01" class="shuaxin" :class="{'go':addRotate}"
 					src="/static/newIndex/change.png" style="width: 32rpx;height:28rpx;">

+ 1 - 1
pages/index/index.scss

xqd
@@ -19,7 +19,7 @@
 			height: 842rpx;
 			background-image: url(@/static/index_lead1.png);
 			background-size: cover;
-			margin-top: 350rpx;
+			margin-top: 280rpx;
 			position: relative;
 			
 			.nextBtn{

+ 57 - 43
pages/painting/draw.scss

xqd
@@ -1,53 +1,67 @@
 .outer{
 	position: relative;
-	.leadBg{
-		position: absolute;
-		width: 100vw;
-		height: 100vh;
-		left: 0;
-		top: 0;
+	
+	.addmask{
+		height: 45px;
+		width: 100%;
+		// background: red;
+		position: fixed;
 		z-index: 9999;
-		background: rgba(0, 0, 0, .69);
-		// padding-left: 38rpx;
-		// padding-right: 38rpx;
+		top: 0;
+		left: 0;
 		
-		display: flex;
-		justify-content: center;
-		.leadBox1{
-			// margin-bottom: 138rpx;
-			width: 674rpx;
-			height: 1134rpx;
-			background-image: url(@/static/hh_lead1.png);
-			background-size: cover;
-			margin-top: 100rpx;
-			position: relative;
+		.leadBg{
+			position: absolute;
 			
-			.nextBtn{
-				width: 350rpx;
-				height: 140rpx;
-				// background: red;
-				
-				position: absolute;
-				right: 0;
-				bottom: 0rpx;
-			}
-		}
-		.leadBox2{
-			width: 674rpx;
+			width: 100vw;
+			height: 100vh;
 			// width: 100%;
-			height: 902rpx;
-			background-image: url(@/static/hh_lead_2.png);
-			background-size: cover;
-			margin-top: 200rpx;
-			position: relative;
+			// height: 100%;
+			left: 0;
+			top: 0;
+			z-index: 9999;
+			background: rgba(0, 0, 0, .69);
+			// padding-left: 38rpx;
+			// padding-right: 38rpx;
 			
-			.nextBtn{
-				width: 350rpx;
-				height: 140rpx;
-				// background: green;
-				position: absolute;
-				right: 0;
-				top:250rpx;
+			display: flex;
+			justify-content: center;
+			.leadBox1{
+				// margin-bottom: 138rpx;
+				width: 674rpx;
+				height: 1134rpx;
+				background-image: url(@/static/hh_lead1.png);
+				background-size: cover;
+				margin-top: 100rpx;
+				position: relative;
+				
+				.nextBtn{
+					width: 350rpx;
+					height: 140rpx;
+					// background: red;
+					
+					position: absolute;
+					right: 0;
+					bottom: 0rpx;
+				}
+			}
+			.leadBox2{
+				width: 674rpx;
+				// width: 100%;
+				height: 902rpx;
+				background-image: url(@/static/hh_lead_2.png);
+				background-size: cover;
+				margin-top: 200rpx;
+				position: relative;
+				
+				.nextBtn{
+					width: 350rpx;
+					height: 140rpx;
+					// background: green;
+					position: absolute;
+					right: 0;
+					top:250rpx;
+				}
 			}
 		}
 	}

+ 13 - 13
pages/painting/draw.vue

xqd xqd
@@ -4,6 +4,19 @@
 			<tn-nav-bar backgroundColor="#207CF7" :bottomShadow="false">AI绘图</tn-nav-bar>
 			<view :style="{ height: tobheight + 'px' }"></view>
 		</view>
+		<!-- 绘画引导界面 -->
+		<view class="addmask" v-if="showHuiHuaLead">
+			<view class="leadBg">
+				<view class="leadBox1" v-if="showLead1">
+					<view class="nextBtn" @click="nextLead">
+					</view>
+				</view>
+				<view class="leadBox2" v-if="showLead2">
+					<view class="nextBtn" @click="finishLead">
+					</view>
+				</view>
+			</view>
+		</view>
 		<u-notice-bar bgColor='#C6D6E4' color='#3F5465' :text="noticebar" step speed="800"></u-notice-bar>
 
 		<view style="margin: 30rpx 30rpx 0;">
@@ -305,19 +318,6 @@
 		<!-- <wike-tabbar :onTabbar="true" :isShowAnimate="true"></wike-tabbar> -->
 		<!-- <u-picker :show="showmode" :columns="modelslist" keyName="name" @cancel="showmode = false"></u-picker> -->
 
-
-
-		<!-- 绘画引导界面 -->
-		<div class="leadBg" v-if="showHuiHuaLead">
-			<div class="leadBox1" v-if="showLead1">
-				<div class="nextBtn" @click="nextLead">
-				</div>
-			</div>
-			<div class="leadBox2" v-if="showLead2">
-				<div class="nextBtn" @click="finishLead">
-				</div>
-			</div>
-		</div>
 	</view>
 </template>