Merge branch 'test' of git.echepei.com:sailun/sailun-tbr-web into test

common/request/request.js

@@ -19,13 +19,17 @@ export function request(config) {
 	let baseURL;
 	// uEnvDev;开发者模式，点击运行
 	if (process.env.NODE_ENV === 'development') {
-	    // TODO
+	    //测试接口
 		baseURL = "http://b2bcnapi.sailuntire.com/allstell/test/app"
+		//正式接口
+		// baseURL = "http://b2bcnapi.sailuntire.com/allstell/app";
 	}
 	// uEnvProd；生产模式，点击发行
 	if (process.env.NODE_ENV === 'production') {
-	    // TODO
-		baseURL = "http://b2bcnapi.sailuntire.com/allstell/test/app";
+	    //测试接口
+		// baseURL = "http://b2bcnapi.sailuntire.com/allstell/test/app"
+		//正式接口
+		baseURL = "http://b2bcnapi.sailuntire.com/allstell/app";
 	};
     let newVar = axios.create({
         baseURL: baseURL,

manifest.json

@@ -1,9 +1,9 @@
 {
     "name" : "耀灵掌上通",
     "appid" : "__UNI__0C3473D",
-    "description" : "测试",
-    "versionName" : "0.1.1",
-    "versionCode" : "100",
+    "description" : "耀灵掌上通是提供给门店使用的移动端管理APP。",
+    "versionName" : "1.0.0",
+    "versionCode" : 1,
     "transformPx" : false,
     "app-plus" : {
         // APP-VUE分包，可提APP升启动速度，2.7.12开始支持，兼容微信小程序分包方案，默认关闭

pages/home/index.vue

@@ -42,7 +42,7 @@
 		<!-- <u-tabbar v-model="current" :list="list"></u-tabbar> -->
 		<u-skeleton :loading="loading" :animation="true"></u-skeleton>
 		<u-toast ref="ulogin" />
-		<luo-version-upgrade v-if="show_s == true" :url="url" :is_force="is_force" :describe="Copywriting"></luo-version-upgrade>
+		<luo-version-upgrade v-if="show_s == true" :version="platform" :url="url" :is_force="is_force" :describe="Copywriting"></luo-version-upgrade>
 	</view>
 </template>
 
@@ -73,6 +73,7 @@
 				url: '',
 				is_force: false,
 				Copywriting: '',
+				platform:''
 			}
 		},
 		onLoad() {
@@ -132,10 +133,10 @@
 			system() {
 				uni.getSystemInfo({
 					success: res => {
-						// let add = ''这个不要删除!
-						// console.log(res)这个不要删除!
+						this.platform =	res.platform
 					},
 					complete: err => {
+						this.platform =	err.platform
 						if (err.platform == 'android') {
 							this.onLaunch_s()
 						} else if (err.platform == 'ios') {
@@ -153,12 +154,6 @@
 							osType: 1
 						}
 					}).then(res => {
-						// 
-						// 
-						//  //最低版本
-						//  //更新文案
-						//  //最新版本
-
 						plus.runtime.getProperty(plus.runtime.appid, (wgtinfo) => {
 							// 
 							//版本号
@@ -233,16 +228,8 @@
 						params: {
 							osType: 0
 						}
-					}).then(res => {
-
-						//最低版本
-						//更新文案
-						//下载最新版地址
-						//最新版本
-
+					}).then(res =>{
 						plus.runtime.getProperty(plus.runtime.appid, (wgtinfo) => {
-
-							//版本号
 							if (wgtinfo.version == res.data.version) {
 								this.show_s = false
 								// uni.showToast({
@@ -250,7 +237,6 @@
 								// 	title: '已是最新版本',
 								// 	position: "bottom"
 								// })
-
 							} else if (wgtinfo.version != res.data.forceVersion) {
 								this.Copywriting = res.data.msg
 								this.show_s = true
@@ -262,7 +248,6 @@
 								this.show_s = true
 								this.url = res.data.url
 							}
-
 						})
 
 					}).catch(err => {

pages/me/Write-off-management/index.vue

@@ -42,8 +42,20 @@
 						<view class="">
 							当前状态
 						</view>
-						<view class="">
-							{{b2bStatus}}
+						<view v-if="res.status == 0">
+							待审核
+						</view>
+						<view v-else-if="res.status == 1">
+							审核未通过
+						</view>
+						<view v-else-if="res.status == 2">
+							审核通过
+						</view>
+						<view v-else-if="res.status == 3">
+							已过期
+						</view>
+						<view v-else-if="res.status == 4">
+							已审核
 						</view>
 					</view>
 				</view>

pages/me/setting/setting.vue

@@ -51,7 +51,7 @@
 			</view>
 		</u-card>
 		<u-button type="primary" @click="exit" style="margin: 20rpx">安全退出</u-button>
-		<luo-version-upgrade v-if="show_s == true" version="1.0.1" :url="url" :is_force="is_force" :describe="Copywriting"></luo-version-upgrade>
+		<luo-version-upgrade v-if="show_s == true" :version="edition_s" :url="url" :is_force="is_force" :describe="Copywriting"></luo-version-upgrade>
 	</view>
 </template>