From fc56a106f9f99b6cee8c283202fc061feadecf78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E6=98=8A=E5=A4=A9?= <442384644@qq.com>
Date: Mon, 14 Nov 2022 18:00:14 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=A8=A1=E7=89=88=E7=9B=AE=E5=BD=95?=
 =?UTF-8?q?=E3=80=91=E6=9B=B4=E6=96=B0=E7=A7=BB=E5=8A=A8=E7=AB=AF=E6=BA=90?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/couponListWindow/index.vue     |   2 +-
 .../components/productWindow/index.vue        |   4 +-
 template/uni-app/manifest.json                |  16 +-
 .../pages/extension/news_details/index.vue    | 534 ++++++------
 .../pages/extension/news_list/index.vue       | 811 +++++++++---------
 .../components/lotteryAleart.vue              |  19 +-
 .../pages/index/diy/components/tabNav.vue     |   2 +-
 template/uni-app/pages/index/diy/index.vue    |   4 +-
 .../index/visualization/components/alive.vue  |   4 +-
 .../pages/users/message_center/index.vue      |   2 +-
 .../uni-app/pages/users/user_cash/index.vue   |   6 +-
 .../users/user_distribution_level/index.vue   |   6 +-
 .../pages/users/user_integral/index.vue       |   2 +-
 .../pages/users/user_payment/index.vue        |   6 +-
 .../pages/users/user_spread_money/index.vue   |  11 +-
 .../pages/users/user_spread_user/index.vue    |   2 +-
 .../pages/users/user_vip_areer/index.vue      |   2 +-
 .../pages/users/wechat_login/index.vue        |   3 +
 template/uni-app/static/css/style.scss        |   2 +-
 19 files changed, 734 insertions(+), 704 deletions(-)

diff --git a/template/uni-app/components/couponListWindow/index.vue b/template/uni-app/components/couponListWindow/index.vue
index 97767b244..285c625c8 100644
--- a/template/uni-app/components/couponListWindow/index.vue
+++ b/template/uni-app/components/couponListWindow/index.vue
@@ -24,7 +24,7 @@
 							<span class='line-title' :class='item.is_use && coupon.count?"gray":""' v-else-if='item.type===1'>{{$t(`品类券`)}}</span>
 							<span class='line-title' :class='item.is_use && coupon.count?"gray":""' v-else>{{$t(`商品券`)}}</span>
 							<image src='../../static/images/fvip.png' class="pic" v-if="item.receive_type===4"></image>
-							<span class='name'>{{item.title}}</span>
+							<span class='name'>{{$t(item.title)}}</span>
 						</view>
 						<view class='data acea-row row-between-wrapper'>
 							<view v-if="item.coupon_time">{{$t(`领取后`)}}{{item.coupon_time}}{{$t(`天内可用`)}}</view>
diff --git a/template/uni-app/components/productWindow/index.vue b/template/uni-app/components/productWindow/index.vue
index 814118afd..c3f241feb 100644
--- a/template/uni-app/components/productWindow/index.vue
+++ b/template/uni-app/components/productWindow/index.vue
@@ -28,12 +28,12 @@
 			<view class="rollTop">
 				<view class="productWinList">
 					<view class="item" v-for="(item, indexw) in attr.productAttr" :key="indexw">
-						<view class="title">{{ item.attr_name }}</view>
+						<view class="title">{{ $t(item.attr_name) }}</view>
 						<view class="listn acea-row row-middle">
 							<view class="itemn" :class="item.index === itemn.attr ? 'on' : ''"
 								v-for="(itemn, indexn) in item.attr_value" @click="tapAttr(indexw, indexn)"
 								:key="indexn">
-								{{ itemn.attr }}
+								{{ $t(itemn.attr) }}
 							</view>
 						</view>
 					</view>
diff --git a/template/uni-app/manifest.json b/template/uni-app/manifest.json
index 31fdae590..f3aeceea7 100644
--- a/template/uni-app/manifest.json
+++ b/template/uni-app/manifest.json
@@ -2,8 +2,8 @@
     "name" : "CRMEB标准版",
     "appid" : "__UNI__A3F1ED4",
     "description" : "CRMEB标准版",
-    "versionName" : "1.0.0",
-    "versionCode" : 100,
+    "versionName" : "4.6.0",
+    "versionCode" : 460,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
@@ -63,7 +63,12 @@
             "ios" : {
                 "capabilities" : {
                     "entitlements" : {
-                        "com.apple.developer.associated-domains" : [ "applinks:", "applinks:", "applinks:" ]
+                        "com.apple.developer.associated-domains" : [
+                            "applinks:",
+                            "applinks:",
+                            "applinks:",
+                            "applinks:static-679f0930-8f60-425c-9033-8c135f397ea5.bspapp.com"
+                        ]
                     }
                 },
                 "privacyDescription" : {
@@ -74,7 +79,8 @@
                     "NSLocationAlwaysUsageDescription" : "根据客户地理位置推荐最近门店",
                     "NSCameraUsageDescription" : "上传用户头像保存分享海报"
                 },
-                "idfa" : false
+                "idfa" : false,
+                "dSYMs" : false
             },
             /* SDK配置 */
             "sdkConfigs" : {
@@ -167,7 +173,7 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "wx1234567890",
+        "appid" : "wx3b82801238ca1b57",
         "setting" : {
             "urlCheck" : false,
             "minified" : true,
diff --git a/template/uni-app/pages/extension/news_details/index.vue b/template/uni-app/pages/extension/news_details/index.vue
index aa3ab1be3..247417f78 100644
--- a/template/uni-app/pages/extension/news_details/index.vue
+++ b/template/uni-app/pages/extension/news_details/index.vue
@@ -1,268 +1,268 @@
-<template>
-	<view :style="colorStyle">
-		<view class='newsDetail'>
-			<view class='title'>{{articleInfo.title}}</view>
-			<view class='list acea-row row-middle'>
-				<view class='label'>{{articleInfo.catename}}</view>
-				<view class='item'></text>{{articleInfo.add_time}}</view>
-				<view class='item'><text class='iconfont icon-liulan'></text>{{articleInfo.visit}}</view>
-			</view>
-			<view class='conters'>
-				<jyf-parser :html="content" ref="article" :tag-style="tagStyle"></jyf-parser>
-			</view>
-			<navigator class="picTxt acea-row row-between-wrapper" v-if="store_info.id"
-				:url="'/pages/goods_details/index?id='+store_info.id" hover-class="none">
-				<view class="pictrue">
-					<image :src="store_info.image"></image>
-				</view>
-				<view class="text">
-					<view class="name line1">{{store_info.store_name}}</view>
-					<view class="money font-color">
-						{{$t(`￥`)}}<text class="num">{{store_info.price}}</text>
-					</view>
-					<view class="y_money">{{$t(`￥`)}}{{store_info.ot_price}}</view>
-				</view>
-				<navigator class="label"><text class="span">{{$t(`查看商品`)}}</text></navigator>
-			</navigator>
-			<!-- #ifdef H5 -->
-			<button class="bnt bg-color" hover-class='none' @click="listenerActionSheet"
-				v-if="this.$wechat.isWeixin()">{{$t(`和好友一起分享`)}}</button>
-			<!-- #endif -->
-			<!-- #ifdef MP -->
-			<button class="bnt bg-color" open-type="share" hover-class='none'>{{$t(`和好友一起分享`)}}</button>
-			<!-- #endif -->
-		</view>
-		<shareInfo @setShareInfoStatus="setShareInfoStatus" :shareInfoStatus="shareInfoStatus"></shareInfo>
-		<!-- #ifndef MP -->
-		<home></home>
-		<!-- #endif -->
-	</view>
-</template>
-
-<script>
-	import {
-		getArticleDetails
-	} from '@/api/api.js';
-	import shareInfo from '../components/shareInfo/index.vue';
-	import home from '@/components/home';
-	import parser from "@/components/jyf-parser/jyf-parser";
-	import colors from "@/mixins/color";
-	export default {
-		components: {
-			shareInfo,
-			home,
-			"jyf-parser": parser
-		},
-		mixins: [colors],
-		data() {
-			return {
-				id: 0,
-				articleInfo: [],
-				store_info: {},
-				content: '',
-				shareInfoStatus: false,
-				tagStyle: {
-					img: 'width:100%;display:block;',
-					table: 'width:100%',
-					video: 'width:100%'
-				}
-			};
-		},
-		/**
-		 * 生命周期函数--监听页面加载
-		 */
-		onLoad: function(options) {
-			if (options.hasOwnProperty('id')) {
-				this.id = options.id;
-			} else {
-				// #ifndef H5
-				uni.navigateBack({
-					delta: 1
-				});
-				// #endif
-				// #ifdef H5
-				history.back();
-				// #endif
-			}
-		},
-		onShow: function() {
-			this.getArticleOne();
-		},
-		methods: {
-			getArticleOne: function() {
-				let that = this;
-				getArticleDetails(that.id).then(res => {
-					uni.setNavigationBarTitle({
-						title: res.data.title.substring(0, 7) + "..."
-					});
-					that.$set(that, 'articleInfo', res.data);
-					that.$set(that, 'store_info', res.data.store_info ? res.data.store_info : {});
-					that.content = res.data.content;
-					// #ifdef H5
-					if (this.$wechat.isWeixin()) {
-						this.setShareInfo();
-					}
-					// #endif
-				});
-			},
-			listenerActionSheet() {
-				this.shareInfoStatus = true
-			},
-			setShareInfoStatus() {
-				this.shareInfoStatus = false
-			},
-			setShareInfo: function() {
-				let href = location.href;
-				let configAppMessage = {
-					title: this.articleInfo.title,
-					desc: this.articleInfo.synopsis,
-					link: href,
-					imgUrl: this.articleInfo.image_input.length ? this.articleInfo.image_input[0] : ""
-				};
-				this.$wechat.wechatEvevt(["updateAppMessageShareData", "updateTimelineShareData",
-					"onMenuShareAppMessage",
-					"onMenuShareTimeline",
-				], configAppMessage);
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	page {
-		background-color: #fff !important;
-	}
-
-	.newsDetail .title {
-		padding: 0 30rpx;
-		font-size: 34rpx;
-		color: #282828;
-		font-weight: bold;
-		margin: 45rpx 0 23rpx 0;
-		line-height: 1.5;
-	}
-
-	.newsDetail .list {
-		margin: 0 30rpx;
-		// border-bottom: 1rpx solid #eee;
-		padding-bottom: 25rpx;
-	}
-
-	.newsDetail .list .label {
-		font-size: 30rpx;
-		color: #B1B2B3;
-		// height: 38rpx;
-		// border-radius: 3rpx;
-		// text-align: center;
-		// line-height: 38rpx;
-		// padding: 0 10rpx;
-	}
-
-	.newsDetail .list .item {
-		margin-left: 27rpx;
-		font-size: 30rpx;
-		color: #B1B2B3;
-	}
-
-	.newsDetail .list .item .iconfont {
-		font-size: 28rpx;
-		margin-right: 10rpx;
-	}
-
-	.newsDetail .list .item .iconfont.icon-shenhezhong {
-		font-size: 26rpx;
-	}
-
-	.newsDetail .conters {
-		padding: 0 30rpx;
-		font-size: 32rpx;
-		color: #8A8B8C;
-		line-height: 1.7;
-	}
-
-	.newsDetail .picTxt {
-		width: 690rpx;
-		height: 200rpx;
-		border-radius: 20rpx;
-		border: 1px solid #e1e1e1;
-		position: relative;
-		margin: 30rpx;
-	}
-
-	.newsDetail .picTxt .pictrue {
-		width: 200rpx;
-		height: 200rpx;
-	}
-
-	.newsDetail .picTxt .pictrue image {
-		width: 100%;
-		height: 100%;
-		border-radius: 20rpx 0 0 20rpx;
-		display: block;
-	}
-
-	.newsDetail .picTxt .text {
-		width: 460rpx;
-	}
-
-	.newsDetail .picTxt .text .name {
-		font-size: 30rpx;
-		color: #282828;
-	}
-
-	.newsDetail .picTxt .text .money {
-		font-size: 24rpx;
-		margin-top: 40rpx;
-		font-weight: bold;
-	}
-
-	.newsDetail .picTxt .text .money .num {
-		font-size: 36rpx;
-	}
-
-	.newsDetail .picTxt .text .y_money {
-		font-size: 26rpx;
-		color: #999;
-		text-decoration: line-through;
-	}
-
-	.newsDetail .picTxt .label {
-		position: absolute;
-		background-color: #303131;
-		width: 160rpx;
-		height: 50rpx;
-		right: -7rpx;
-		border-radius: 25rpx 0 6rpx 25rpx;
-		text-align: center;
-		line-height: 50rpx;
-		bottom: 24rpx;
-	}
-
-	.newsDetail .picTxt .label .span {
-		background-image: linear-gradient(to right, #fff71e 0%, #f9b513 100%);
-		-webkit-background-clip: text;
-		-webkit-text-fill-color: transparent;
-	}
-
-	.newsDetail .picTxt .label:after {
-		content: " ";
-		position: absolute;
-		width: 0;
-		height: 0;
-		border-bottom: 8rpx solid #303131;
-		border-right: 8rpx solid transparent;
-		top: -7rpx;
-		right: 0;
-	}
-
-	.newsDetail .bnt {
-		color: #fff;
-		font-size: 30rpx;
-		width: 690rpx;
-		height: 90rpx;
-		border-radius: 45rpx;
-		margin: 48rpx auto;
-		text-align: center;
-		line-height: 90rpx;
-	}
+<template>
+	<view :style="colorStyle">
+		<view class='newsDetail'>
+			<view class='title'>{{articleInfo.title}}</view>
+			<view class='list acea-row row-middle'>
+				<view class='label'>{{articleInfo.catename}}</view>
+				<view class='item'></text>{{articleInfo.add_time}}</view>
+				<view class='item'><text class='iconfont icon-liulan'></text>{{articleInfo.visit}}</view>
+			</view>
+			<view class='conters'>
+				<jyf-parser :html="content" ref="article" :tag-style="tagStyle"></jyf-parser>
+			</view>
+			<navigator class="picTxt acea-row row-between-wrapper" v-if="store_info.id"
+				:url="'/pages/goods_details/index?id='+store_info.id" hover-class="none">
+				<view class="pictrue">
+					<image :src="store_info.image"></image>
+				</view>
+				<view class="text">
+					<view class="name line1">{{store_info.store_name}}</view>
+					<view class="money font-color">
+						{{$t(`￥`)}}<text class="num">{{store_info.price}}</text>
+					</view>
+					<view class="y_money">{{$t(`￥`)}}{{store_info.ot_price}}</view>
+				</view>
+				<navigator class="label"><text class="span">{{$t(`查看商品`)}}</text></navigator>
+			</navigator>
+			<!-- #ifdef H5 -->
+			<button class="bnt bg-color" hover-class='none' @click="listenerActionSheet"
+				v-if="this.$wechat.isWeixin()">{{$t(`和好友一起分享`)}}</button>
+			<!-- #endif -->
+			<!-- #ifdef MP -->
+			<button class="bnt bg-color" open-type="share" hover-class='none'>{{$t(`和好友一起分享`)}}</button>
+			<!-- #endif -->
+		</view>
+		<shareInfo @setShareInfoStatus="setShareInfoStatus" :shareInfoStatus="shareInfoStatus"></shareInfo>
+		<!-- #ifndef MP -->
+		<home></home>
+		<!-- #endif -->
+	</view>
+</template>
+
+<script>
+	import {
+		getArticleDetails
+	} from '@/api/api.js';
+	import shareInfo from '../components/shareInfo/index.vue';
+	import home from '@/components/home';
+	import parser from "@/components/jyf-parser/jyf-parser";
+	import colors from "@/mixins/color";
+	export default {
+		components: {
+			shareInfo,
+			home,
+			"jyf-parser": parser
+		},
+		mixins: [colors],
+		data() {
+			return {
+				id: 0,
+				articleInfo: [],
+				store_info: {},
+				content: '',
+				shareInfoStatus: false,
+				tagStyle: {
+					img: 'width:100%;display:block;',
+					table: 'width:100%',
+					video: 'width:100%'
+				}
+			};
+		},
+		/**
+		 * 生命周期函数--监听页面加载
+		 */
+		onLoad: function(options) {
+			if (options.hasOwnProperty('id')) {
+				this.id = options.id;
+			} else {
+				// #ifndef H5
+				uni.navigateBack({
+					delta: 1
+				});
+				// #endif
+				// #ifdef H5
+				history.back();
+				// #endif
+			}
+		},
+		onShow: function() {
+			this.getArticleOne();
+		},
+		methods: {
+			getArticleOne: function() {
+				let that = this;
+				getArticleDetails(that.id).then(res => {
+					uni.setNavigationBarTitle({
+						title: res.data.title.substring(0, 7) + "..."
+					});
+					that.$set(that, 'articleInfo', res.data);
+					that.$set(that, 'store_info', res.data.store_info ? res.data.store_info : {});
+					that.content = res.data.content;
+					// #ifdef H5
+					if (this.$wechat.isWeixin()) {
+						this.setShareInfo();
+					}
+					// #endif
+				});
+			},
+			listenerActionSheet() {
+				this.shareInfoStatus = true
+			},
+			setShareInfoStatus() {
+				this.shareInfoStatus = false
+			},
+			setShareInfo: function() {
+				let href = location.href + '&spid=' + this.$store.state.app.uid;
+				let configAppMessage = {
+					title: this.articleInfo.title,
+					desc: this.articleInfo.synopsis,
+					link: href,
+					imgUrl: this.articleInfo.image_input.length ? this.articleInfo.image_input[0] : ""
+				};
+				this.$wechat.wechatEvevt(["updateAppMessageShareData", "updateTimelineShareData",
+					"onMenuShareAppMessage",
+					"onMenuShareTimeline",
+				], configAppMessage);
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	page {
+		background-color: #fff !important;
+	}
+
+	.newsDetail .title {
+		padding: 0 30rpx;
+		font-size: 34rpx;
+		color: #282828;
+		font-weight: bold;
+		margin: 45rpx 0 23rpx 0;
+		line-height: 1.5;
+	}
+
+	.newsDetail .list {
+		margin: 0 30rpx;
+		// border-bottom: 1rpx solid #eee;
+		padding-bottom: 25rpx;
+	}
+
+	.newsDetail .list .label {
+		font-size: 30rpx;
+		color: #B1B2B3;
+		// height: 38rpx;
+		// border-radius: 3rpx;
+		// text-align: center;
+		// line-height: 38rpx;
+		// padding: 0 10rpx;
+	}
+
+	.newsDetail .list .item {
+		margin-left: 27rpx;
+		font-size: 30rpx;
+		color: #B1B2B3;
+	}
+
+	.newsDetail .list .item .iconfont {
+		font-size: 28rpx;
+		margin-right: 10rpx;
+	}
+
+	.newsDetail .list .item .iconfont.icon-shenhezhong {
+		font-size: 26rpx;
+	}
+
+	.newsDetail .conters {
+		padding: 0 30rpx;
+		font-size: 32rpx;
+		color: #8A8B8C;
+		line-height: 1.7;
+	}
+
+	.newsDetail .picTxt {
+		width: 690rpx;
+		height: 200rpx;
+		border-radius: 20rpx;
+		border: 1px solid #e1e1e1;
+		position: relative;
+		margin: 30rpx;
+	}
+
+	.newsDetail .picTxt .pictrue {
+		width: 200rpx;
+		height: 200rpx;
+	}
+
+	.newsDetail .picTxt .pictrue image {
+		width: 100%;
+		height: 100%;
+		border-radius: 20rpx 0 0 20rpx;
+		display: block;
+	}
+
+	.newsDetail .picTxt .text {
+		width: 460rpx;
+	}
+
+	.newsDetail .picTxt .text .name {
+		font-size: 30rpx;
+		color: #282828;
+	}
+
+	.newsDetail .picTxt .text .money {
+		font-size: 24rpx;
+		margin-top: 40rpx;
+		font-weight: bold;
+	}
+
+	.newsDetail .picTxt .text .money .num {
+		font-size: 36rpx;
+	}
+
+	.newsDetail .picTxt .text .y_money {
+		font-size: 26rpx;
+		color: #999;
+		text-decoration: line-through;
+	}
+
+	.newsDetail .picTxt .label {
+		position: absolute;
+		background-color: #303131;
+		width: 160rpx;
+		height: 50rpx;
+		right: -7rpx;
+		border-radius: 25rpx 0 6rpx 25rpx;
+		text-align: center;
+		line-height: 50rpx;
+		bottom: 24rpx;
+	}
+
+	.newsDetail .picTxt .label .span {
+		background-image: linear-gradient(to right, #fff71e 0%, #f9b513 100%);
+		-webkit-background-clip: text;
+		-webkit-text-fill-color: transparent;
+	}
+
+	.newsDetail .picTxt .label:after {
+		content: " ";
+		position: absolute;
+		width: 0;
+		height: 0;
+		border-bottom: 8rpx solid #303131;
+		border-right: 8rpx solid transparent;
+		top: -7rpx;
+		right: 0;
+	}
+
+	.newsDetail .bnt {
+		color: #fff;
+		font-size: 30rpx;
+		width: 690rpx;
+		height: 90rpx;
+		border-radius: 45rpx;
+		margin: 48rpx auto;
+		text-align: center;
+		line-height: 90rpx;
+	}
 </style>
diff --git a/template/uni-app/pages/extension/news_list/index.vue b/template/uni-app/pages/extension/news_list/index.vue
index 3b3794401..ec454283a 100644
--- a/template/uni-app/pages/extension/news_list/index.vue
+++ b/template/uni-app/pages/extension/news_list/index.vue
@@ -1,404 +1,409 @@
-<template>
-	<view :style="colorStyle">
-		<view class='newsList'>
-			<view class='swiper' v-if="imgUrls.length > 0">
-				<swiper indicator-dots="true" :autoplay="autoplay" :circular="circular" :interval="interval"
-					:duration="duration" indicator-color="rgba(102,102,102,0.3)" indicator-active-color="#666">
-					<block v-for="(item,index) in imgUrls" :key="index">
-						<swiper-item>
-							<navigator :url="'/pages/extension/news_details/index?id='+item.id">
-								<image :src="item.image_input[0]" class="slide-image" />
-							</navigator>
-						</swiper-item>
-					</block>
-				</swiper>
-			</view>
-			<view class='nav' v-if="navList.length > 0">
-				<scroll-view class="scroll-view_x" scroll-x scroll-with-animation :scroll-left="scrollLeft"
-					style="width:auto;overflow:hidden;">
-					<block v-for="(item,index) in navList" :key="index">
-						<view class='item' :class='active==item.id?"on":""' @click='tabSelect(item.id, index, item)'
-							:id="`news_${item.id}`">
-							<view>{{item.title}}</view>
-							<view class='line bg-color' v-if="active==item.id"></view>
-						</view>
-					</block>
-
-
-				</scroll-view>
-				<scroll-view class="scroll-view_x" scroll-x scroll-with-animation style="width:auto;overflow:hidden;">
-					<view class="coutry-list">
-						<view class="coutry" :class='activeCou==coutry.id?"on":""' v-for="(coutry,index) in coutList"
-							:key="index" @click="getCidArticle(coutry.id,1)">
-							{{coutry.title}}
-						</view>
-					</view>
-				</scroll-view>
-			</view>
-			<view class='list'>
-				<block v-for="(item,index) in articleList" :key="index">
-					<navigator :url='"/pages/extension/news_details/index?id="+item.id' hover-class='none'
-						class='item acea-row row-between-wrapper' v-if="item.image_input.length == 1">
-						<view class='text acea-row row-column-between'>
-							<view class='name line2'>{{item.title}}</view>
-							<view>{{item.add_time}}</view>
-						</view>
-						<view class='pictrue'>
-							<image :src='item.image_input[0]'></image>
-						</view>
-					</navigator>
-					<navigator :url='"/pages/extension/news_details/index?id="+item.id' hover-class='none' class='item'
-						v-else-if="item.image_input.length == 2">
-						<view class='title line1'>{{item.title}}</view>
-						<view class='picList acea-row row-between-wrapper'>
-							<block v-for="(itemImg,indexImg) in item.image_input" :key="indexImg">
-								<view class='pictrue'>
-									<image :src='itemImg'></image>
-								</view>
-							</block>
-						</view>
-						<view class='time'>{{item.add_time}}</view>
-					</navigator>
-					<navigator :url='"/pages/extension/news_details/index?id="+item.id' hover-class='none' class='item'
-						v-else-if="item.image_input.length > 2">
-						<view class='title line1'>{{item.title}}</view>
-						<view class='picList on acea-row row-between-wrapper'>
-							<block v-for="(itemImg,indexImg) in item.image_input" :key="indexImg">
-								<view class='pictrue'>
-									<image :src='itemImg'></image>
-								</view>
-							</block>
-						</view>
-						<view class='time'>{{item.add_time}}</view>
-					</navigator>
-				</block>
-			</view>
-		</view>
-		<view class='noCommodity' v-if="articleList.length == 0 && (page != 1 || active== 0)">
-			<view class='emptyBox'>
-				<image :src="imgHost + '/statics/images/empty-box.png'"></image>
-			</view>
-		</view>
-		<!-- #ifndef MP -->
-		<home></home>
-		<!-- #endif -->
-	</view>
-</template>
-
-<script>
-	import {
-		getArticleCategoryList,
-		getArticleList,
-		getArticleHotList,
-		getArticleBannerList
-	} from '@/api/api.js';
-	import home from '@/components/home';
-	import colors from "@/mixins/color";
-	import {HTTP_REQUEST_URL} from '@/config/app';
-	export default {
-		components: {
-			home
-		},
-		mixins: [colors],
-		data() {
-			return {
-				imgHost:HTTP_REQUEST_URL,
-				coutList: [],
-				imgUrls: [],
-				articleList: [],
-				indicatorDots: false,
-				circular: true,
-				autoplay: true,
-				interval: 3000,
-				duration: 500,
-				navList: [],
-				active: 0,
-				page: 1,
-				limit: 8,
-				status: false,
-				scrollLeft: 0,
-				activeCou: 0
-			};
-		},
-		/**
-		 * 生命周期函数--监听页面显示
-		 */
-		onShow: function() {
-			this.getArticleHot();
-			this.getArticleBanner();
-			this.getArticleCate();
-			this.status = false;
-			this.page = 1;
-			this.articleList = [];
-		},
-		/**
-		 * 页面上拉触底事件的处理函数
-		 */
-		onReachBottom: function() {
-			this.getCidArticle(this.activeCou);
-		},
-		methods: {
-			getArticleHot: function() {
-				let that = this;
-				getArticleHotList().then(res => {
-					that.$set(that, 'articleList', res.data);
-				});
-			},
-			getArticleBanner: function() {
-				let that = this;
-				getArticleBannerList().then(res => {
-					that.imgUrls = res.data;
-				});
-			},
-			getCidArticle(id, type) {
-				let that = this;
-				if (type) {
-					that.status = false
-					this.activeCou = id
-					this.$set(this, 'articleList', []);
-					that.page = 1
-				}
-				// if (id == 0) return;
-				let limit = that.limit;
-				let page = that.page;
-				let articleList = that.articleList;
-				if (that.status) return;
-				getArticleList(that.activeCou, {
-					page: page,
-					limit: limit
-				}).then(res => {
-					let articleListNew = [];
-					let len = res.length;
-					articleListNew = articleList.concat(res.data);
-					that.page++;
-					that.$set(that, 'articleList', articleListNew);
-					that.status = limit > len;
-					that.page = that.page;
-				});
-			},
-			getArticleCate() {
-				let that = this;
-				getArticleCategoryList().then(res => {
-					that.$set(that, 'navList', res.data);
-				});
-			},
-			tabSelect(active, e, item) {
-				this.active = active;
-				this.scrollLeft = e * 60;
-				//	this.scrollLeft = (active - 1) * 50;
-				if (this.active == 0) {
-					this.$set(this, 'coutList', []);
-					this.$set(this, 'articleList', []);
-					this.getArticleHot();
-				} else {
-					this.$set(this, 'articleList', []);
-					this.$set(this, 'coutList', []);
-					if (item.children.length) {
-						this.page = 1;
-						this.status = false;
-						this.activeCou = item.children[0].id || 0
-						this.coutList = item.children || []
-						this.$set(this, 'articleList', []);
-						this.getCidArticle(this.activeCou);
-					}else{
-						this.page = 1;
-						this.status = false;
-						this.$set(this, 'articleList', []);
-						this.getCidArticle(item.id,true);
-					}
-
-				}
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	.noCommodity {
-		border-top-width: 0;
-		padding-bottom: 30rpx;
-		.emptyBox{
-			margin-top: 50rpx;
-			text-align: center;
-			.tips{
-				color: #aaa;
-				font-size: 26rpx;
-			}
-			image {
-				width: 414rpx;
-				height: 304rpx;
-			}
-		}
-	}
-
-	page {
-		background-color: #fff !important;
-	}
-
-	.newsList .swiper {
-		width: 100%;
-		position: relative;
-		box-sizing: border-box;
-		padding: 30rpx 30rpx 0 30rpx;
-	}
-
-	.newsList .swiper swiper {
-		width: 100%;
-		height: 365rpx;
-		position: relative;
-	}
-
-	.newsList .swiper .slide-image {
-		width: 100%;
-		height: 335rpx;
-		border-radius: 6rpx;
-	}
-
-	// #ifdef APP-PLUS || H5
-	.newsList /deep/uni-swiper .uni-swiper-dots-horizontal {
-		bottom: 20px;
-	}
-
-	.newsList .swiper /deep/.uni-swiper-dot {
-		width: 12rpx !important;
-		height: 12rpx !important;
-		border-radius: 0;
-		transform: rotate(-45deg);
-		transform-origin: 0 100%;
-	}
-
-	.newsList .swiper /deep/.uni-swiper-dot~.uni-swiper-dot {
-		margin-left: 5rpx;
-	}
-
-	// #endif
-	// #ifdef MP
-	.newsList /deep/wx-swiper .wx-swiper-dots-horizontal {
-		bottom: 0;
-	}
-
-	.newsList .swiper /deep/.wx-swiper-dot {
-		width: 12rpx !important;
-		height: 12rpx !important;
-		border-radius: 0;
-		transform: rotate(-45deg);
-		transform-origin: 0 100%;
-	}
-
-	.newsList .swiper /deep/.wx-swiper-dot~.wx-swiper-dot {
-		margin-left: 5rpx;
-	}
-
-	// #endif
-	.newsList .nav {
-		padding: 0 30rpx;
-		width: 100%;
-		white-space: nowrap;
-		box-sizing: border-box;
-		margin-top: 43rpx;
-	}
-
-	.newsList .nav .item {
-		display: inline-block;
-		font-size: 32rpx;
-		color: #999999;
-	}
-
-	.newsList .nav .item.on {
-		color: #000;
-		font-size: 36rpx;
-		font-weight: bold;
-	}
-
-	.newsList .nav .item~.item {
-		margin-left: 46rpx;
-	}
-
-	.newsList .nav .item .line {
-		width: 24rpx;
-		height: 4rpx;
-		border-radius: 2rpx;
-		margin: 10rpx auto 0 auto;
-	}
-
-	.newsList .list {
-		margin-top: 20rpx;
-	}
-
-	.newsList .list .item {
-		margin: 0 30rpx;
-		border-bottom: 1rpx solid #f0f0f0;
-		padding: 35rpx 0;
-	}
-
-	.newsList .list .item .pictrue {
-		width: 250rpx;
-		height: 156rpx;
-	}
-
-	.newsList .list .item .pictrue image {
-		width: 100%;
-		height: 100%;
-		border-radius: 6rpx;
-	}
-
-	.newsList .list .item .text {
-		width: 420rpx;
-		height: 156rpx;
-		font-size: 24rpx;
-		color: #999;
-	}
-
-	.newsList .list .item .text .name {
-		font-size: 30rpx;
-		color: #282828;
-	}
-
-	.newsList .list .item .picList .pictrue {
-		width: 335rpx;
-		height: 210rpx;
-		margin-top: 30rpx;
-	}
-
-	.newsList .list .item .picList.on .pictrue {
-		width: 217rpx;
-		height: 136rpx;
-	}
-
-	.newsList .list .item .picList .pictrue image {
-		width: 100%;
-		height: 100%;
-		border-radius: 6rpx;
-	}
-
-	.newsList .list .item .time {
-		text-align: right;
-		font-size: 24rpx;
-		color: #999;
-		margin-top: 22rpx;
-	}
-
-	.coutry-list {
-		display: flex;
-		align-items: center;
-		margin-top: 10rpx;
-		padding-top: 20rpx;
-		border-top: 1px solid #F2F2F2;
-
-		.coutry {
-			// background-color: #F5F5F5;
-			border-radius: 26rpx;
-			padding: 4rpx 20rpx;
-			color: #666666;
-			font-size: 26rpx;
-			margin-right: 20rpx;
-		}
-
-		.coutry.on {
-			// background-color: rgba(220, 217, 236, 1);
-			border-style: solid;
-			border-width: 2rpx;
-			color: #E93323;
-		}
-	}
+<template>
+	<view :style="colorStyle">
+		<view class='newsList'>
+			<view class='swiper' v-if="imgUrls.length > 0">
+				<swiper indicator-dots="true" :autoplay="autoplay" :circular="circular" :interval="interval"
+					:duration="duration" indicator-color="rgba(102,102,102,0.3)" indicator-active-color="#666">
+					<block v-for="(item,index) in imgUrls" :key="index">
+						<swiper-item>
+							<navigator :url="'/pages/extension/news_details/index?id='+item.id">
+								<image :src="item.image_input[0]" class="slide-image" />
+							</navigator>
+						</swiper-item>
+					</block>
+				</swiper>
+			</view>
+			<view class='nav' v-if="navList.length > 0">
+				<scroll-view class="scroll-view_x" scroll-x scroll-with-animation :scroll-left="scrollLeft"
+					style="width:auto;overflow:hidden;">
+					<block v-for="(item,index) in navList" :key="index">
+						<view class='item' :class='active==item.id?"on":""' @click='tabSelect(item.id, index, item)'
+							:id="`news_${item.id}`">
+							<view>{{item.title}}</view>
+							<view class='line bg-color' v-if="active==item.id"></view>
+						</view>
+					</block>
+
+
+				</scroll-view>
+				<scroll-view class="scroll-view_x" scroll-x scroll-with-animation style="width:auto;overflow:hidden;">
+					<view class="coutry-list">
+						<view class="coutry" :class='activeCou==coutry.id?"on":""' v-for="(coutry,index) in coutList"
+							:key="index" @click="getCidArticle(coutry.id,1)">
+							{{coutry.title}}
+						</view>
+					</view>
+				</scroll-view>
+			</view>
+			<view class='list'>
+				<block v-for="(item,index) in articleList" :key="index">
+					<navigator :url='"/pages/extension/news_details/index?id="+item.id' hover-class='none'
+						class='item acea-row row-between-wrapper' v-if="item.image_input.length == 1">
+						<view class='text acea-row row-column-between'>
+							<view class='name line2'>{{item.title}}</view>
+							<view>{{item.add_time}}</view>
+						</view>
+						<view class='pictrue'>
+							<image :src='item.image_input[0]'></image>
+						</view>
+					</navigator>
+					<navigator :url='"/pages/extension/news_details/index?id="+item.id' hover-class='none' class='item'
+						v-else-if="item.image_input.length == 2">
+						<view class='title line1'>{{item.title}}</view>
+						<view class='picList acea-row row-between-wrapper'>
+							<block v-for="(itemImg,indexImg) in item.image_input" :key="indexImg">
+								<view class='pictrue'>
+									<image :src='itemImg'></image>
+								</view>
+							</block>
+						</view>
+						<view class='time'>{{item.add_time}}</view>
+					</navigator>
+					<navigator :url='"/pages/extension/news_details/index?id="+item.id' hover-class='none' class='item'
+						v-else-if="item.image_input.length > 2">
+						<view class='title line1'>{{item.title}}</view>
+						<view class='picList on acea-row row-between-wrapper'>
+							<block v-for="(itemImg,indexImg) in item.image_input" :key="indexImg">
+								<view class='pictrue'>
+									<image :src='itemImg'></image>
+								</view>
+							</block>
+						</view>
+						<view class='time'>{{item.add_time}}</view>
+					</navigator>
+				</block>
+			</view>
+		</view>
+		<view class='noCommodity' v-if="articleList.length == 0 && (page != 1 || active== 0)">
+			<view class='emptyBox'>
+				<image :src="imgHost + '/statics/images/empty-box.png'"></image>
+			</view>
+		</view>
+		<!-- #ifndef MP -->
+		<home></home>
+		<!-- #endif -->
+	</view>
+</template>
+
+<script>
+	import {
+		getArticleCategoryList,
+		getArticleList,
+		getArticleHotList,
+		getArticleBannerList
+	} from '@/api/api.js';
+	import home from '@/components/home';
+	import colors from "@/mixins/color";
+	import {
+		HTTP_REQUEST_URL
+	} from '@/config/app';
+	export default {
+		components: {
+			home
+		},
+		mixins: [colors],
+		data() {
+			return {
+				imgHost: HTTP_REQUEST_URL,
+				coutList: [],
+				imgUrls: [],
+				articleList: [],
+				indicatorDots: false,
+				circular: true,
+				autoplay: true,
+				interval: 3000,
+				duration: 500,
+				navList: [],
+				active: 0,
+				page: 1,
+				limit: 8,
+				status: false,
+				scrollLeft: 0,
+				activeCou: 0
+			};
+		},
+		/**
+		 * 生命周期函数--监听页面显示
+		 */
+		onShow: function() {
+			this.getArticleHot();
+			this.getArticleBanner();
+			this.getArticleCate();
+			this.status = false;
+			this.page = 1;
+			this.articleList = [];
+		},
+		/**
+		 * 页面上拉触底事件的处理函数
+		 */
+		onReachBottom: function() {
+			this.getCidArticle(this.activeCou);
+		},
+		methods: {
+			getArticleHot: function() {
+				let that = this;
+				getArticleHotList().then(res => {
+					that.$set(that, 'articleList', res.data);
+				});
+			},
+			getArticleBanner: function() {
+				let that = this;
+				getArticleBannerList().then(res => {
+					that.imgUrls = res.data;
+				});
+			},
+			getCidArticle(id, type) {
+				let that = this;
+				if (type) {
+					that.status = false
+					this.activeCou = id
+					this.$set(this, 'articleList', []);
+					that.page = 1
+				}
+				// if (id == 0) return;
+				let limit = that.limit;
+				let page = that.page;
+				let articleList = that.articleList;
+				if (that.status) return;
+				getArticleList(that.activeCou, {
+					page: page,
+					limit: limit
+				}).then(res => {
+					let articleListNew = [];
+					let len = res.length;
+					articleListNew = articleList.concat(res.data);
+					that.page++;
+					that.$set(that, 'articleList', articleListNew);
+					that.status = limit > len;
+					that.page = that.page;
+				});
+			},
+			getArticleCate() {
+				let that = this;
+				getArticleCategoryList().then(res => {
+					that.$set(that, 'navList', res.data);
+				});
+			},
+			tabSelect(active, e, item) {
+				this.active = active;
+				this.scrollLeft = e * 60;
+				//	this.scrollLeft = (active - 1) * 50;
+				if (this.active == 0) {
+					this.$set(this, 'coutList', []);
+					this.$set(this, 'articleList', []);
+					this.getArticleHot();
+				} else {
+					this.$set(this, 'articleList', []);
+					this.$set(this, 'coutList', []);
+					if (item.children.length) {
+						this.page = 1;
+						this.status = false;
+						this.activeCou = item.children[0].id || 0
+						this.coutList = item.children || []
+						this.$set(this, 'articleList', []);
+						this.getCidArticle(this.activeCou);
+					} else {
+						this.page = 1;
+						this.status = false;
+						this.$set(this, 'articleList', []);
+						this.getCidArticle(item.id, true);
+					}
+
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.noCommodity {
+		border-top-width: 0;
+		padding-bottom: 30rpx;
+
+		.emptyBox {
+			margin-top: 50rpx;
+			text-align: center;
+
+			.tips {
+				color: #aaa;
+				font-size: 26rpx;
+			}
+
+			image {
+				width: 414rpx;
+				height: 304rpx;
+			}
+		}
+	}
+
+	page {
+		background-color: #fff !important;
+	}
+
+	.newsList .swiper {
+		width: 100%;
+		position: relative;
+		box-sizing: border-box;
+		padding: 30rpx 30rpx 0 30rpx;
+	}
+
+	.newsList .swiper swiper {
+		width: 100%;
+		height: 365rpx;
+		position: relative;
+	}
+
+	.newsList .swiper .slide-image {
+		width: 100%;
+		height: 335rpx;
+		border-radius: 6rpx;
+	}
+
+	// #ifdef APP-PLUS || H5
+	.newsList /deep/uni-swiper .uni-swiper-dots-horizontal {
+		bottom: 20px;
+	}
+
+	.newsList .swiper /deep/.uni-swiper-dot {
+		width: 12rpx !important;
+		height: 12rpx !important;
+		border-radius: 0;
+		transform: rotate(-45deg);
+		transform-origin: 0 100%;
+	}
+
+	.newsList .swiper /deep/.uni-swiper-dot~.uni-swiper-dot {
+		margin-left: 5rpx;
+	}
+
+	// #endif
+	// #ifdef MP
+	.newsList /deep/wx-swiper .wx-swiper-dots-horizontal {
+		bottom: 0;
+	}
+
+	.newsList .swiper /deep/.wx-swiper-dot {
+		width: 12rpx !important;
+		height: 12rpx !important;
+		border-radius: 0;
+		transform: rotate(-45deg);
+		transform-origin: 0 100%;
+	}
+
+	.newsList .swiper /deep/.wx-swiper-dot~.wx-swiper-dot {
+		margin-left: 5rpx;
+	}
+
+	// #endif
+	.newsList .nav {
+		padding: 0 30rpx;
+		width: 100%;
+		white-space: nowrap;
+		box-sizing: border-box;
+		margin-top: 43rpx;
+	}
+
+	.newsList .nav .item {
+		display: inline-block;
+		font-size: 32rpx;
+		color: #999999;
+	}
+
+	.newsList .nav .item.on {
+		color: #000;
+		font-size: 36rpx;
+		font-weight: bold;
+	}
+
+	.newsList .nav .item~.item {
+		margin-left: 46rpx;
+	}
+
+	.newsList .nav .item .line {
+		width: 24rpx;
+		height: 4rpx;
+		border-radius: 2rpx;
+		margin: 10rpx auto 0 auto;
+	}
+
+	.newsList .list {
+		margin-top: 20rpx;
+	}
+
+	.newsList .list .item {
+		margin: 0 30rpx;
+		border-bottom: 1rpx solid #f0f0f0;
+		padding: 35rpx 0;
+	}
+
+	.newsList .list .item .pictrue {
+		width: 250rpx;
+		height: 156rpx;
+	}
+
+	.newsList .list .item .pictrue image {
+		width: 100%;
+		height: 100%;
+		border-radius: 6rpx;
+	}
+
+	.newsList .list .item .text {
+		width: 420rpx;
+		height: 156rpx;
+		font-size: 24rpx;
+		color: #999;
+	}
+
+	.newsList .list .item .text .name {
+		font-size: 30rpx;
+		color: #282828;
+	}
+
+	.newsList .list .item .picList .pictrue {
+		width: 335rpx;
+		height: 210rpx;
+		margin-top: 30rpx;
+	}
+
+	.newsList .list .item .picList.on .pictrue {
+		width: 217rpx;
+		height: 136rpx;
+	}
+
+	.newsList .list .item .picList .pictrue image {
+		width: 100%;
+		height: 100%;
+		border-radius: 6rpx;
+	}
+
+	.newsList .list .item .time {
+		text-align: right;
+		font-size: 24rpx;
+		color: #999;
+		margin-top: 22rpx;
+	}
+
+	.coutry-list {
+		display: flex;
+		align-items: center;
+		margin-top: 10rpx;
+		padding-top: 20rpx;
+		border-top: 1px solid #F2F2F2;
+
+		.coutry {
+			// background-color: #F5F5F5;
+			border-radius: 26rpx;
+			padding: 4rpx 20rpx;
+			color: #666666;
+			font-size: 26rpx;
+			margin-right: 20rpx;
+		}
+
+		.coutry.on {
+			// background-color: rgba(220, 217, 236, 1);
+			border-style: solid;
+			border-width: 2rpx;
+			color: #E93323;
+		}
+	}
 </style>
diff --git a/template/uni-app/pages/goods/order_pay_status/components/lotteryAleart.vue b/template/uni-app/pages/goods/order_pay_status/components/lotteryAleart.vue
index 218f895bc..8f021779a 100644
--- a/template/uni-app/pages/goods/order_pay_status/components/lotteryAleart.vue
+++ b/template/uni-app/pages/goods/order_pay_status/components/lotteryAleart.vue
@@ -2,14 +2,14 @@
 	<view class="aleart" v-if="aleartStatus">
 		<image src="../../../../static/images/poster-close.png" class="close" @click="posterImageClose"></image>
 		<view class="title">
-			{{aleartData.title}}
+			{{$t(aleartData.title)}}
 		</view>
 		<view class="aleart-body">
 			<image v-if="aleartData.img" class="goods-img" :src="aleartData.img" mode=""></image>
-			<text class="msg">{{aleartData.msg}}</text>
+			<text class="msg">{{$t(aleartData.msg)}}</text>
 		</view>
 		<view class="btn" @click="posterImageClose()">
-			{{aleartData.btn}}
+			{{$t('我知道了')}}
 		</view>
 	</view>
 </template>
@@ -37,16 +37,19 @@
 			aleartType(type) {
 				if (type === 1) {
 					this.aleartData = {
-						title: this.$t(`no_raffle`),
-						msg: this.$t(`lottery_msg`),
-						btn: this.$t(`i_see`)
+						title: '暂无抽奖资格',
+						msg: `1、您未关注公众号
+2、您未获得VIP权限，获取VIP途径：
+（1）购买过打通版的用户可在会员群联系官方客服开通
+（2）官方小程序商城购买CRMEB打通版、企业版后自动开通`,
+						btn: '我知道了'
 					}
 				} else if (type === 2) {
 					this.aleartData = {
-						title: this.$t(`lottery_result`),
+						title: '中奖记录',
 						img: this.alData.image,
 						msg: this.alData.prompt,
-						btn: this.$t(`ok`),
+						btn: '我知道了',
 						type: this.alData.type
 					}
 				}
diff --git a/template/uni-app/pages/index/diy/components/tabNav.vue b/template/uni-app/pages/index/diy/components/tabNav.vue
index 876ccd86e..2b1e18b1e 100644
--- a/template/uni-app/pages/index/diy/components/tabNav.vue
+++ b/template/uni-app/pages/index/diy/components/tabNav.vue
@@ -80,7 +80,7 @@
 				getCategoryList().then(res => {
 					res.data.unshift({
 						"id": -99,
-						'cate_name': that.$t(`首页`)
+						'cate_name': '首页'
 					})
 					that.tabTitle = res.data;
 					setTimeout((e) => {
diff --git a/template/uni-app/pages/index/diy/index.vue b/template/uni-app/pages/index/diy/index.vue
index 7495edbb3..cd6bff2b7 100644
--- a/template/uni-app/pages/index/diy/index.vue
+++ b/template/uni-app/pages/index/diy/index.vue
@@ -59,7 +59,7 @@
 								@click="changeSort(item, index)" :class="{ on: curSort == index }">
 								<image :src="item.pic" mode="" v-if="item.pic"></image>
 								<image src="/static/images/sort-img.png" mode="" v-else></image>
-								<view class="txt">{{ item.cate_name }}</view>
+								<view class="txt">{{ $t(item.cate_name) }}</view>
 							</view>
 						</view>
 					</scroll-view>
@@ -99,7 +99,7 @@
 								@click="changeSort(item, index)" :class="{ on: curSort == index }">
 								<image :src="item.pic" mode="" v-if="item.pic"></image>
 								<image src="/static/images/sort-img.png" mode="" v-else></image>
-								<view class="txt">{{ item.cate_name }}</view>
+								<view class="txt">{{ $t(item.cate_name) }}</view>
 							</view>
 						</view>
 					</scroll-view>
diff --git a/template/uni-app/pages/index/visualization/components/alive.vue b/template/uni-app/pages/index/visualization/components/alive.vue
index a6b46b1d6..059c55ed5 100644
--- a/template/uni-app/pages/index/visualization/components/alive.vue
+++ b/template/uni-app/pages/index/visualization/components/alive.vue
@@ -5,7 +5,7 @@
 		<view class="live" v-if="isIframe">
 			<view v-if="isIframe && liveList.length>0">
 				<view class="title-box" v-if="titleInfo.length">
-					<text class="title">{{titleInfo[0].val}}</text>
+					<text class="title">{{$t(titleInfo[0].val)}}</text>
 					<navigator class="more">{{$t(`查看更多`)}}<text class="iconfont icon-jiantou"></text></navigator>
 				</view>
 				<view class="live-wrapper-a">
@@ -28,7 +28,7 @@
 							<image :src="item.share_img"></image>
 						</view>
 						<view class="info">
-							<view class="title line1">{{item.name}}</view>
+							<view class="title line1">{{$t(item.name)}}</view>
 							<!-- <view class="people">
 							<image :src="item.anchor_img" alt="">
 								<text>{{item.anchor_name}}</text>
diff --git a/template/uni-app/pages/users/message_center/index.vue b/template/uni-app/pages/users/message_center/index.vue
index bd4936106..b9df4e482 100644
--- a/template/uni-app/pages/users/message_center/index.vue
+++ b/template/uni-app/pages/users/message_center/index.vue
@@ -8,7 +8,7 @@
 				</view>
 			</view>
 			<view class="read-all" @click="allLook()">
-				全部已读
+				{{$t(`全部已读`)}}
 			</view>
 		</view>
 		<view v-if="list.length && type ===1" class="list">
diff --git a/template/uni-app/pages/users/user_cash/index.vue b/template/uni-app/pages/users/user_cash/index.vue
index 96a07405a..8d93107e1 100644
--- a/template/uni-app/pages/users/user_cash/index.vue
+++ b/template/uni-app/pages/users/user_cash/index.vue
@@ -228,8 +228,12 @@
 				let that = this;
 				extractBank().then(res => {
 					let array = res.data.extractBank;
-					array.unshift(that.$t(`请选择银行`));
+					array.unshift('请选择银行');
+					array.forEach((v, i) => {
+					    array.splice(i,1,that.$t(v))
+					})
 					that.$set(that, 'array', array);
+					console.log(array)
 					that.minPrice = res.data.minPrice;
 					that.brokerageType = res.data.brokerageType ? parseInt(res.data.brokerageType) : 0;
 				});
diff --git a/template/uni-app/pages/users/user_distribution_level/index.vue b/template/uni-app/pages/users/user_distribution_level/index.vue
index d916492c7..2965599b0 100644
--- a/template/uni-app/pages/users/user_distribution_level/index.vue
+++ b/template/uni-app/pages/users/user_distribution_level/index.vue
@@ -15,7 +15,7 @@
 										<view class="text">
 											<view class="name">{{userInfo.nickname}}</view>
 											<view class="level" :class="{'level-sty':item.grade > (levelInfo.grade || 0)}">
-												{{item.name}}
+												{{$t(item.name)}}
 											</view>
 										</view>
 									</view>
@@ -71,7 +71,7 @@
 						<view class="text">
 							<view class="title">
 								<view class="name line2">
-									{{item.name}}
+									{{$t(item.name)}}
 									<text class="iconfont icon-wenti" @click="opHelp(index)"></text>
 								</view>
 
@@ -83,7 +83,7 @@
 									class="fill"></view>
 							</view>
 							<view class="info-box">
-								<view class="info">{{item.finish ? '' : item.task_type_title}}</view>
+								<view class="info">{{item.finish ? '' : $t(item.task_type_title)}}</view>
 								<view class="link" hover-class="none">
 									<text class="new-number">{{item.new_number}}</text>
 									/{{item.number}}
diff --git a/template/uni-app/pages/users/user_integral/index.vue b/template/uni-app/pages/users/user_integral/index.vue
index c862d6f1e..4fff13146 100644
--- a/template/uni-app/pages/users/user_integral/index.vue
+++ b/template/uni-app/pages/users/user_integral/index.vue
@@ -41,7 +41,7 @@
 					</view>
 					<view class='item acea-row row-between-wrapper' v-for="(item,index) in integralList" :key="index">
 						<view>
-							<view class='state'>{{$t(item.mark)}}</view>
+							<view class='state'>{{$t(item.title)}}</view>
 							<view>{{item.add_time}}</view>
 						</view>
 						<view class='num font-color' v-if="item.pm">+{{item.number}}</view>
diff --git a/template/uni-app/pages/users/user_payment/index.vue b/template/uni-app/pages/users/user_payment/index.vue
index 97337d079..0514103f4 100644
--- a/template/uni-app/pages/users/user_payment/index.vue
+++ b/template/uni-app/pages/users/user_payment/index.vue
@@ -15,7 +15,7 @@
 					<view class="pic-box pic-box-color acea-row row-center-wrapper row-column" :class="activePic == index ? 'pic-box-color-active' : ''"
 					 v-for="(item, index) in picList" :key="index" @click="picCharge(index, item)" v-if="item.price">
 						<view class="pic-number-pic">
-							<span class="pic-number"> {{$t(`元`)}}</span>{{ item.price }}
+							{{ item.price }}<span class="pic-number"> {{$t(`元`)}}</span>
 						</view>
 						<view class="pic-number">{{$t(`赠送`)}}：{{ item.give_money }} {{$t(`元`)}} </view>
 					</view>
@@ -26,7 +26,7 @@
 					<view class="tips-box">
 						<view class="tips mt-30">{{$t(`注意事项`)}}：</view>
 						<view class="tips-samll" v-for="item in rechargeAttention" :key="item">
-							{{ item }}
+							{{ $t(item) }}
 						</view>
 					</view>
 
@@ -40,7 +40,7 @@
 					<view class="tips-box">
 						<view class="tips mt-30">{{$t(`注意事项`)}}：</view>
 						<view class="tips-samll" v-for="item in rechargeAttention" :key="item">
-							{{ item }}
+							{{ $t(item) }}
 						</view>
 					</view>
 				</view>
diff --git a/template/uni-app/pages/users/user_spread_money/index.vue b/template/uni-app/pages/users/user_spread_money/index.vue
index 29653be70..d1a7d06d3 100644
--- a/template/uni-app/pages/users/user_spread_money/index.vue
+++ b/template/uni-app/pages/users/user_spread_money/index.vue
@@ -19,7 +19,7 @@
 							<view class='listn'>
 								<block v-for="(child,indexn) in item.child" :key="indexn">
 									<view class='itemn acea-row row-between-wrapper'>
-										<view>
+										<view class="title">
 											<view class='name line1'>{{$t(child.title)}}</view>
 											<view>{{child.add_time}}</view>
 											<view class="fail-msg" v-if="child.fail_msg">
@@ -201,4 +201,13 @@
 	.commission-details .promoterHeader .headerCon .money .num {
 		font-family: 'Guildford Pro';
 	}
+	.sign-record .list .item .listn .itemn .name{
+		width: 100%;
+		// max-width: 100%;
+		white-space: break-spaces;
+	}
+	.sign-record .list .item .listn .itemn .title {
+		padding-right: 30rpx;
+		flex: 1;
+	}
 </style>
diff --git a/template/uni-app/pages/users/user_spread_user/index.vue b/template/uni-app/pages/users/user_spread_user/index.vue
index bf9b45a4d..a47202778 100644
--- a/template/uni-app/pages/users/user_spread_user/index.vue
+++ b/template/uni-app/pages/users/user_spread_user/index.vue
@@ -9,7 +9,7 @@
 							<image class="avatar" :src="userInfo.avatar" mode=""></image>
 							<view class="nickname">{{userInfo.nickname}}</view>
 							<view v-if="userInfo.is_agent_level" class="level" @click="jumbPath">
-								<text>{{userInfo.agent_level_name?userInfo.agent_level_name:$t(`分销等级`)}}</text>
+								<text>{{userInfo.agent_level_name?$t(userInfo.agent_level_name):$t(`分销等级`)}}</text>
 								<text v-if="userInfo.is_agent_level" class='iconfont icon-xiangyou'></text>
 							</view>
 						</view>
diff --git a/template/uni-app/pages/users/user_vip_areer/index.vue b/template/uni-app/pages/users/user_vip_areer/index.vue
index e56be077b..e2b49f8b4 100644
--- a/template/uni-app/pages/users/user_vip_areer/index.vue
+++ b/template/uni-app/pages/users/user_vip_areer/index.vue
@@ -7,7 +7,7 @@
 			<view v-if="expList.length" class="list">
 				<view class="item acea-row row-between-wrapper" v-for="(item,index) in expList">
 					<view class="text">
-						<view class="name">{{item.title}}</view>
+						<view class="name">{{$t(item.title)}}</view>
 						<view class="data">{{item.add_time}}</view>
 					</view>
 					<view class="num" v-if="item.pm">+{{item.number}}</view>
diff --git a/template/uni-app/pages/users/wechat_login/index.vue b/template/uni-app/pages/users/wechat_login/index.vue
index 9edbf5c45..be469f1d2 100644
--- a/template/uni-app/pages/users/wechat_login/index.vue
+++ b/template/uni-app/pages/users/wechat_login/index.vue
@@ -151,6 +151,9 @@
 				// if (!that.$store.getters.isLogin && uni.getStorageSync('authIng')) {
 				// 	uni.setStorageSync('authIng', false)
 				// }
+				if (options.back_url) {
+					uni.setStorageSync('snRouter', options.back_url);
+				}
 				if (!that.$store.getters.isLogin && Auth.isWeixin()) {
 					let code
 					if (options.code instanceof Array) {
diff --git a/template/uni-app/static/css/style.scss b/template/uni-app/static/css/style.scss
index 732333197..7afeb95be 100644
--- a/template/uni-app/static/css/style.scss
+++ b/template/uni-app/static/css/style.scss
@@ -550,7 +550,7 @@
 }
 
 .sign-record .list .item .listn .itemn .name {
-	width: 390rpx;
+	// width: 390rpx;
 	font-size: 28rpx;
 	color: #282828;
 	margin-bottom: 10rpx