Merge branch 'v4.7.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v4.7.0dev

template/uni-app/pages/annex/vip_paid/index.vue

@@ -50,7 +50,7 @@
 					@click="checkType(item)">
 					<view>{{item.title}}</view>
 					<view class="new">{{$t(`￥`)}}<text class="num">{{item.pre_price | moneyFormat}}</text></view>
-					<view v-if="item.type === 'free'" class="info">{{$t(`试用`)}}{{item.vip_day}}{{$t(`天.`)}}</view>
+					<view v-if="item.type === 'free'" class="info">{{$t(`试用`)}}{{item.vip_day}}{{$t(`天`)}}</view>
 					<view v-else class="old">{{$t(`￥`)}}{{item.price | moneyFormat}}</view>
 				</view>
 			</scroll-view>

template/uni-app/pages/goods_details/index.vue

@@ -757,10 +757,10 @@
 					summary: that.storeInfo.store_info,
 					imageUrl: that.storeInfo.small_image,
 					success: function(res) {
-						uni.showToast({
-							title: that.$t(`分享成功`),
-							icon: "success",
-						});
+						// uni.showToast({
+						// 	title: that.$t(`分享成功`),
+						// 	icon: "success",
+						// });
 						that.posters = false;
 					},
 					fail: function(err) {

template/uni-app/pages/index/visualization/index.vue

@@ -59,12 +59,10 @@
 			<newGoods :dataConfig="goodList.cc" @click.native="bindEdit('goodList', 'cc')"></newGoods>
 			<!-- 精品推荐 -->
 			<!-- <mBanner :dataConfig="swiperBg.cc" @click.native="bindEdit('swiperBg','cc')"></mBanner> -->
-
 			<!-- <titles :dataConfig="titles.default" :sty="'off'" @click.native="bindEdit('titles','default')"></titles> -->
 			<!-- 商品轮播 -->
-
 			<!-- 		<customerService :dataConfig="customerService.default" @click.native="bindEdit('customerService','default')"></customerService> -->
-			<!-- 促销单品 -->
+			<!-- 精选单品 -->
 			<promotion :dataConfig="goodList.dd" @click.native="bindEdit('goodList', 'dd')"></promotion>
 			<!-- 商品分类 -->
 			<tabNav class="sticky-box" :style="'top:' + isTop + 'px;'" :dataConfig="tabNav.default"

template/uni-app/pages/users/auth/index.vue

@@ -51,7 +51,7 @@
 	import {
 		registerVerify
 	} from '@/api/user.js'
-	import Verify from '../components/verify/verify.vue';
+	import Verify from '../components/verify/index.vue';
 	export default {
 		name: "Auth",
 		components: {

template/uni-app/pages/users/components/login_mobile/index.vue

@@ -21,7 +21,7 @@
 	const app = getApp();
 	import sendVerifyCode from "@/mixins/SendVerifyCode";
 	import Routine from '@/libs/routine';
-	import Verify from '../verify/verify.vue';
+	import Verify from '../verify/index.vue';
 	import Cache from '@/utils/cache';
 	import {
 		loginMobile,

template/uni-app/pages/users/components/verify/index.vue

@@ -38,7 +38,7 @@
 	 * Verify 验证码组件
 	 * @description 分发验证码使用
 	 * */
-	import VerifySlide from './verifySlider/verifySlider'
+	import VerifySlide from './verifySlider/index.vue'
 	import verifySliderPc from './verifySlider/verifySliderPc'
 	import VerifyPoint from "./verifyPoint/verifyPoint"
 

template/uni-app/pages/users/login/index.vue

@@ -129,7 +129,7 @@
 	// #endif
 	const BACK_URL = "login_back_url";
 	import colors from '@/mixins/color.js';
-	import Verify from '../components/verify/verify.vue';
+	import Verify from '../components/verify/index.vue';
 	export default {
 		name: "Login",
 		components: {
@@ -845,4 +845,4 @@
 	.main-color {
 		color: var(--view-theme);
 	}
-</style>
+</style>

template/uni-app/pages/users/user_phone/index.vue

@@ -25,7 +25,7 @@
 
 <script>
 	import sendVerifyCode from "@/mixins/SendVerifyCode";
-	import Verify from '../components/verify/verify.vue';
+	import Verify from '../components/verify/index.vue';
 	import {
 		registerVerify,
 		bindingUserPhone,

template/uni-app/pages/users/user_pwd_edit/index.vue

@@ -52,7 +52,7 @@
 	import authorize from '@/components/Authorize';
 	// #endif
 	import colors from '@/mixins/color.js';
-	import Verify from '../components/verify/verify.vue';
+	import Verify from '../components/verify/index.vue';
 	export default {
 		mixins: [sendVerifyCode, colors],
 		components: {