10.17下班提交

App.vue

@@ -449,12 +449,13 @@ export default {
           appId: "3364888",
           appKey: "75D5Vqsg63wok0S0w4SKog0w8",
           certificateName: "Expert_Op_Push",
-          secret: "9e93Ce2AbA97E15F3852279b639b014e",
+          secret: "416a4f5eF822ddcB73B627Cc310636D7",
+          
         },
         vivoPush: {
           appId: "100034326",
           appKey: "e789634c1f76c8f184b1def1101ce824",
-          certificateName: "Expert_vivo_Push",
+          certificateName: "Expert_Vi_Push",
           secret: "416a4f5eF822ddcB73B627Cc310636D7",
         },
         fcmPush: {

components/navBar/navbar.vue

@@ -1,7 +1,7 @@
 <template>
 	<!-- 顶部导航栏 -->
 	<uni-nav-bar
-		:left-icon="showLeft?left:''"
+		:left-icon="showLeft?'left':''"
 		:title="title"
 		@clickLeft="goBack"
 		fixed

manifest.json

@@ -16,12 +16,17 @@
             "autoclose" : true,
             "delay" : 0
         },
+        "useragent": {
+			"value": "gdxz",
+			"concatenate": true
+		},
         "modules" : {
             "OAuth" : {},
             "Payment" : {},
             "Share" : {},
             "Webview-x5" : {},
             "UIWebview" : {},
+            "Push" : {},
             "VideoPlayer" : {}
         },
         /* 模块配置 */

pages/index/index.vue

@@ -94,7 +94,7 @@
             class="notice-swiper"
             :vertical="true"
             :autoplay="true"
-            :interval="3000"
+            :interval="5000"
             :duration="1000"
             :circular="true"
             @change="onNoticeChange"
@@ -488,7 +488,7 @@ const getStartpage = () => {
 		if (adData.value.url) {
 			// 有跳转链接，跳转到指定页面
 			uni.navigateTo({
-				url: '/pages/webview/webview?url=' + adData.value.url
+				url: '/pages_app/webview/webview?url=' + encodeURIComponent(adData.value.url)+'&title=肝胆相照'
 			});
 		} else {
 			// 没有跳转链接，直接跳转到首页

pages_app/consult/consult.vue

@@ -404,12 +404,12 @@ function onReachBottom(){
 .list-scroll {
 	flex: 1;
 	position: fixed;
-	top: 228rpx;
+	top: 268rpx;
 	bottom: 136rpx;
 	padding: 8px 0px 0 0px;
-    margin: 20rpx 30rpx 0;
+    margin: 20rpx rpx 0;
     box-sizing: border-box;
-    width:auto;
+    width:100%;
 }
 
 .consult-card {

pages_app/login/login.vue

@@ -11,7 +11,7 @@
 						<up-image  :src="logo" width="164rpx" height="167rpx" ></up-image>
 					
 				</view>
-				<text class="app-name">专家端</text>
+				<text class="app-name">专家版</text>
 			</view>
            
 			<!-- 手机号显示 -->
@@ -218,7 +218,7 @@
 								uni.setStorageSync('userInfo', res.data);
 							}
 							const app = getApp()
-							app.initNim({ account:result.data.YX_accid, token: result.data.YX_token })
+							app.initNim({appkey: "885dea390870814acf3ba8558c717572", account:result.data.YX_accid, token: result.data.YX_token })
 							// 跳转到首页
 							uni.redirectTo({
 								url: '/pages/index/index'

pages_app/personInfo/personInfo.vue

@@ -131,19 +131,21 @@
 			<!-- 专长 -->
 			<view class="row" @click="onEditSpecialty">
 				<view class="label"><text>专长</text></view>
-				<view class="value with-arrow">
+				<view class="value with-arrow intro">
 					<text>{{ getSpecialtyText() }}</text>
-					<uni-icons type="right" size="18" color="#bbb" />
+					
 				</view>
+				<uni-icons type="right" size="18" color="#bbb" />
 			</view>
 
 			<!-- 个人简介 -->
 			<view class="row" @click="onEdit('intro',form.intro)">
 				<view class="label"><text>个人简介</text></view>
-				<view class="value with-arrow">
+				<view class="value with-arrow intro">
 					<text>{{ form.intro || '暂无简介' }}</text>
-					<uni-icons type="right" size="18" color="#bbb" />
+					
 				</view>
+				<uni-icons type="right" size="18" color="#bbb" />
 			</view>
 		</scroll-view>
 
@@ -815,8 +817,20 @@ const confirmSpecialties = () => {
 		color: #666;
 		font-size: 30rpx;
 	}
+	.intro{
+		flex: 1;
+		max-width:80%;
+		
+		display: flex;
+		align-items: center;
+		justify-content: flex-end;
+	}
 	.with-arrow text {
+		
 		margin-right: 14rpx;
+		white-space: nowrap;
+		overflow: hidden;
+		text-overflow: ellipsis;
 	}
 	.value-avatar {
 		gap: 14rpx;

pages_app/pwdLogin/pwdLogin.vue

@@ -12,7 +12,7 @@
 						<up-image  :src="logo" width="164rpx" height="167rpx" ></up-image>
 					
 				</view>
-				<text class="app-name">专家端</text>
+				<text class="app-name">专家版</text>
 			</view>
            
 			<!-- 手机号输入 -->
@@ -254,6 +254,8 @@
 				title: '登录成功',
 				icon: 'none'
 			});
+		 const app = getApp()
+         app.initNim({appkey: "885dea390870814acf3ba8558c717572", account:result.YX_accid, token: result.YX_token })
 			console.log(3)
 			uni.redirectTo({
 				url:'/pages/index/index'
@@ -327,9 +329,10 @@
 								uni.setStorageSync('DEV_AUTH_YX_TOKEN_App', res.data.YX_token);
 								uni.setStorageSync('userInfo', res.data);
 							}
-
+							const app = getApp()
+							app.initNim({ account:result.data.YX_accid, token: result.data.YX_token })
 							// 跳转到首页
-							navTo({
+							uni.redirectTo({
 								url: '/pages/index/index'
 							})
 						}).catch(err=>{

pages_app/smsLogin/smsLogin.vue

@@ -12,7 +12,7 @@
 						<up-image  :src="logo" width="164rpx" height="167rpx" ></up-image>
 					
 				</view>
-				<text class="app-name">专家端</text>
+				<text class="app-name">专家版</text>
 			</view>
            
 			<!-- 手机号输入 -->
@@ -366,7 +366,7 @@
 					
 				
 				const app = getApp()
-				app.initNim({ account:result.YX_accid, token: result.YX_token })
+				app.initNim({appkey: "885dea390870814acf3ba8558c717572", account:result.YX_accid, token: result.YX_token })
 				uni.showToast({
 					title: '登录成功',
 					icon: 'none'

pages_app/webview/webview.vue

@@ -1,6 +1,6 @@
 <template>
   <view class="container">
-    <navBar :title="title"></navBar>
+    <navBar :title="title" :showLeft="true"></navBar>
   </view>
 </template>
 

tsconfig.json

@@ -45,3 +45,4 @@
 
 
 
+