Merge branch 'dev-video' into test

.env.js

-;
 (function() {
-	let NODE_ENV = 'test'; // dev:开发环境 | test:测试环境 | prod:生产环境
+	let NODE_ENV = 'prod'; // dev:开发环境 | test:测试环境 | prod:生产环境
 	let ENV_VAR = null;
-    let VERSION_NUMBER = '1.2.9';//版本号
+    let VERSION_NUMBER = '1.3.1';//版本号
     //小程序是否审核通过，参数配置在ucenter库version表，对应版本号的is_audit设置为1，将显示学习视频
 	if (process.env.NODE_ENV === "development") {
 		if (NODE_ENV === 'dev') {

src/pages.json

@@ -42,8 +42,8 @@
 		{
 			"path": "pages/login/index",
 			"style": {
-				"navigationBarTitleText": "授权登录",
-				"navigationStyle": "custom" ,
+				// "navigationBarTitleText": "授权登录",
+				"navigationBarBackgroundColor":"#FFFFFF",
 				"disableScroll": true
 			}
 		}

src/pages/learn/section.vue

@@ -33,17 +33,14 @@
                         </view>
                     </view>
                     <u-line color="#F4F5F7" margin="30rpx 0 0 0" />
-                    <view class="learn-view-title">目录</view>
-                    <view class="scroll_box">
-                        <scroll-view scroll-x @scroll="scroll" :scroll-left="scrollValue">
-                            <view class="item_list" :class="{'item_list_active': item.isActive}"
-                             v-for="(item, index) in sectionList" :key="index" @click="goNext(item)">
-                                    <view class="" style="font-size: 24rpx;">{{ item.title }}</view>
-                                    <view class="" style="font-size: 26rpx;margin-top: 16rpx;">
-                                        {{ item.intro }}
-                                    </view>
-                            </view>
-                        </scroll-view>
+                    <view class="learn-view-title u-margin-bottom-0">目录</view>
+                    <view class="scroll_box u-padding-bottom-50">
+                        <view class="item_list" :class="{'item_list_active': item.isActive,
+                         'u-margin-left-30':(index%2==1), 'is-learned': item.isLearned && !item.isActive}"
+                         v-for="(item, index) in sectionList" :key="index" @click="goNext(item)">
+                                <view class="item-title-1">{{ item.title }}</view>
+                                <view class="item-title-2">{{ item.intro }}</view>
+                        </view>
                     </view>
                 </view>
             </view>
@@ -399,7 +396,7 @@
         // margin-bottom: 20rpx;
         font-size: 32rpx;
         color: #333333;
-        height: 820rpx;
+        // height: 820rpx;
         padding: 0 30rpx;
 
         .learn-view-title {
@@ -478,30 +475,27 @@
             background-color: blue;
         }
     }
-
-    .scroll_box {
-        width: 100%;
-        height: 150rpx;
-        overflow: hidden;
-        background: #fff;
-        margin-top: 30rpx;
-        white-space: nowrap;
-    }
-
-    .scroll_box scroll-view {
-        height: 100%;
-        width: auto;
-        overflow: hidden;
-    }
-
+    
     .item_list {
-        width: 280rpx;
+        width: 330rpx;
         height: 150rpx;
-        margin-right: 23rpx;
         display: inline-block;
-        background-color: #F4F5F7;
         border-radius: 12rpx;
         padding: 20rpx;
+        margin-top: 30rpx;
+        border: 1px solid #999999;
+        color: #666666;
+        
+        .item-title-1 {
+            font-size: 24rpx;
+            color: #333333;
+        }
+        
+        .item-title-2 {
+            font-size: 26rpx;
+            margin-top: 16rpx;
+            color: #666666;
+        }
     }
     
     .item_list_active {
@@ -509,6 +503,31 @@
         color: #2272FF;
         border: 2rpx solid #2272FF;
         box-sizing: border-box;
+        
+        .item-title-1 {
+            font-size: 24rpx;
+            color: #2272FF;
+        }
+        
+        .item-title-2 {
+            font-size: 26rpx;
+            margin-top: 16rpx;
+            color: #2272FF;
+        }
+    }
+    
+    .is-learned {
+        border: 1px solid #EEEEEE;
+        .item-title-1 {
+            font-size: 24rpx;
+            color: #999999;
+        }
+        
+        .item-title-2 {
+            font-size: 26rpx;
+            margin-top: 16rpx;
+            color: #999999;
+        }
     }
     
     .teacher-intro {

src/pages/login/index.vue

@@ -19,7 +19,7 @@
 				<view class="bind-phone">{{ bindPhone }}</view>
 				<view class="bind-tips">{{ bindTips }}</view>
 			</view>
-			<u-gap height="570"></u-gap>
+			<u-gap height="480"></u-gap>
 			<button class="loginBtn" v-if="needAuth" lang="zh_CN" @tap="getUserProfile">
 				<text class="u-font-32 white">{{ loginTitle }}</text>
 			</button>
@@ -160,7 +160,7 @@ export default {
 								login.signup(params).then(res => {
 									uni.hideLoading()
 									if (res) {
-										app.setUserData(res.data, that)
+										login.setUserData(res.data, that)
 										app.track('signup_login', {mobile: res.data.mobile});
 										app.profileSet(that)
 										app.profileAppend(that)
@@ -171,11 +171,11 @@ export default {
 											title: '授权失败，请重新授权',
 											icon: 'none'
 										});
-										this.setLoginStatus(false)
+										that.setLoginStatus(false)
 									}
 								}).catch(res => {
 									uni.hideLoading()
-									this.setLoginStatus(false)
+									that.setLoginStatus(false)
 								})
 							},
 							fail () {

src/pages/order/detail.vue

@@ -22,6 +22,10 @@
 					<text>合作厂商：</text>
 					<text>{{ order.partnerCompanyName }}</text>
 				</view>
+				<view class="order-cell">
+					<text>厂商编号：</text>
+					<text>{{ order.partnerSerialNumber }}</text>
+				</view>
 				<view class="order-cell between-cell">
 					<view class="left">
 						<text>客户信息：</text>

src/utils/util.js

@@ -35,6 +35,17 @@ const setOpenid = function (openid) {
 	}
 }
 
+async function validImages(imgurl) {
+    let exists = false
+	await uni.getImageInfo({
+      src: imgurl,
+      success (res) {
+    	exists = true
+      }
+    })
+	return exists
+}
+
 /**
  * ====图片本地缓存====
  * @param {Object} vm	当前vue实例
@@ -44,10 +55,11 @@ const setOpenid = function (openid) {
 const imageCache = function (vm, src, host) {
 	host = host || process.uniEnv.qn_base_url
 	let image_url = host + src
+	return image_url // 临时
 	let image_name = md5Libs.md5(image_url)
 	var arr = Object.keys(vm.vuex_cache);
-	if (vm.vuex_cache && arr.length && arr.includes(image_name)) {
-		// call_back(vm.vuex_cache[image_name])
+	if (vm.vuex_cache && arr.length && arr.includes(image_name) &&
+		validImages(vm.vuex_cache[image_name])) {
 		return vm.vuex_cache[image_name]
 	} else {
 		// 本地没有缓存 需要下载