Merge branch 'dev' of https://git.banshouhui.com/lijundan/self-support into dev

.env.js

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

src/pages/learn/news-details.vue

-<template>
-    <view class="news-wrap">
-        <u-navbar
-            back-icon-color="#000000"
-            :background="background"
-            title-color="#000000"
-            :border-bottom="false">
-        </u-navbar>
-        <view class="title">
-            {{ title }}
+<template>
+    <view>
+        <u-navbar back-icon-color="#000000" :background="background" title-color="#000000" :border-bottom="false">
+        </u-navbar>
+        <view class="title">
+            {{ title }}
+        </view>
+        <view class="creat_at">
+            {{create_at}}
         </view>
-		<view class="time-txt">
-			{{time | datefmt('YYYY.MM.DD HH:mm:ss')}}
-		</view>
         <view class="u-content">
-            <u-parse :html="body" :tag-style="style" :selectable="true"></u-parse>
-        </view>
-    </view>
-</template>
-
-<script>
-    export default {
-        data() {
-            return {
-                title: '',
-                body: '',
-				time: '',
-				style: {
-					// 字符串的形式
-					p: `
-						color: #666666;
-						font-size: 24rpx;
-						letter-spacing: 0.03rpx;
-					`,
-					span: 'font-size: 26rpx',
-					img: `
-						padding: 40rpx 0;
-					`,
-				},
-            }
-        },
-        onLoad() {
-			getApp().trackPage('消息通知详情页')
-            var that = this;
-            const eventChannel = this.getOpenerEventChannel()
-            eventChannel.on('acceptDataFromLearn', function(data) {
-                that.title = data.title;
-                that.body = data.body;
-				that.time = data.create_at
-            })
-            this.$u.mpShare.path = ''
-        },
-    }
-</script>
-
+            <u-parse :html="body" :tag-style="style"></u-parse>
+        </view>
+    </view>
+</template>
+
+<script>
+export default {
+    data() {
+        return {
+            title: "",
+            body: "",
+            create_at: "",
+        };
+    },
+    onLoad() {
+        getApp().trackPage("消息通知详情页");
+        var that = this;
+        const eventChannel = this.getOpenerEventChannel();
+        eventChannel.on("acceptDataFromLearn", function (data) {
+            that.title = data.title;
+            that.body = data.body;
+            that.create_at = data.create_at;
+            console.log(data);
+        });
+        this.$u.mpShare.path = "";
+    },
+};
+</script>
+
 <style>
-	.news-wrap {
-		background-color: #FFFFFF;
-		height: 100vh;
-	}
-    .title{
-        font-size: 36rpx;
-        font-weight: bold;
-		margin: 20rpx 30rpx;
-    }
-	.time-txt {
-		margin: 0 30rpx;
-		font-size: 24rpx;
-		font-weight: 400;
-		color: #999999;
-		line-height: 24rpx;
-	}
-    .u-content{
-        font-size: 24rpx;
-        line-height: 36rpx;
-        color: #666666;
-        margin-left: 30rpx;
-        margin-right: 30rpx;
-    }
-</style>
+.title {
+    font-size: 32rpx;
+    font-weight: bold;
+    margin-left: 30rpx;
+    margin-top: 30rpx;
+}
+.u-content {
+    font-size: 24rpx;
+    line-height: 36rpx;
+    color: #666666;
+    margin-left: 30rpx;
+    margin-right: 30rpx;
+}
+.creat_at {
+    font-size: 24rpx;
+    color: #999999;
+    margin-left: 30rpx;
+    margin-top: 20rpx;
+}
+rich-text {
+    margin-top: 40rpx;
+    display: block;
+}
+</style>

src/pages/order/detail.vue

@@ -40,12 +40,12 @@
 			<!-- 不是从我的页面，而是其他页面进来 -->
 			<view v-else>
 				<!-- 业务文件 -->
-				<view class="order-file" v-if="showFile">
+				<view class="order-file" v-if="showFile" @click="$u.throttle(handleClickFile, 500)">
 					<view class="order-file-left">
 						<image :src="wenjianImage" class="file-image"></image>
 						<text>充电桩安装业务文件</text>
 					</view>
-					<view class="order-file-right" @click="$u.throttle(handleClickFile, 500)">
+					<view class="order-file-right">
 						<text>点击查看</text>
 						<u-icon name="arrow-right"></u-icon>
 					</view>
@@ -682,7 +682,7 @@
 			},
 			// 去业务材料页面
 			handleClickFile() {
-				
+				this.$u.route({url: 'pages/order/document'})
 			},
 			trackOrder() {
 				// 接单成功事件，签到成功事件