Merge remote-tracking branch 'remotes/origin/master' into developerB

components/cm-module/activity/activity_on_1.vue

@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<view class="tui-alert-class tui-alert-box" :class="[show?'tui-alert-show':'tui-alert-hide']"  @touchmove.stop.prevent="discard">
-			<image src="https://admin-b.caimei365.com/userfiles/1/images/photo/2020/08/icon-alert%402x.png" mode="" @click.stop="handleClick"></image>
+			<image src="https://admin-b.caimei365.com/userfiles/1/images/photo/2020/08/aa%402x.png" mode="" @click.stop="handleClick"></image>
 			<text class="iconfont icon-iconfontguanbi" @click.stop="handleClickCancel"></text>
 		</view>
 	</view>

h5/pages/activity/activity_mid.vue

@@ -1,8 +1,6 @@
 <template>
 	<view class="activity" :class="isRequest ? 'active' :''">
-		<view class="topBanner">
-			<image src="https://admin-b.caimei365.com/userfiles/1/images/photo/2020/08/icon-topbanner%402x.png" mode=""></image>
-		</view>
+		<view class="topBanner"><image src="https://admin.caimei365.com/userfiles/1/images/photo/2020/08/top-bg%402x.png" mode=""></image></view>
 		<view class="activity-main clearfix" :class="inputActive">
 			<view class="home-hotmaintab-fixed">
 				<view class="home-flex-tab show">
@@ -34,7 +32,13 @@
 						</view>
 						<view class="list-name">{{pros.name}}</view>
 						<template v-if="hasLogin">
-							<template v-if="userIdentity != 2">
+							<template v-if="userIdentity == 2 || userIdentity == 1">
+								<view class="list-price">
+									<view class="price-new">￥<text class="big">{{pros.retailPrice}}</text><text>{{pros.smallPrice}}</text></view>
+									<view class="price-old">￥<text class="big">{{toFixedFn(pros.price1)}}</text><text></text></view>
+								</view>
+							</template>
+							<template v-if="userIdentity == 4">
 								<view class="list-price none">
 									<view class="price-left">
 										<text class="icon"></text>
@@ -45,12 +49,6 @@
 									</view>
 								</view>
 							</template>
-							<template v-else>
-								<view class="list-price">
-									<view class="price-new">￥<text class="big">{{pros.retailPrice}}</text><text>{{pros.smallPrice}}</text></view>
-									<view class="price-old">￥<text class="big">{{toFixedFn(pros.price1)}}</text><text></text></view>
-								</view>
-							</template>
 						</template>
 						<template v-else>
 							<view class="list-price none">
@@ -260,7 +258,7 @@
 				return {
 				  title: '采美年中大促，折扣满满，全场低至9元~',
 				  path: '/h5/pages/activity/activity_mid',
-				  imageUrl:'https://admin-b.caimei365.com/userfiles/1/images/photo/2020/08/icon-share%402x.png'
+				  imageUrl:'https://admin.caimei365.com/userfiles/1/images/photo/2020/08/share%402x.png'
 				}
 			},
 			onPageScrollTop(){
@@ -272,8 +270,6 @@
 			onCreateSelectorQuery(event,index,classIndex){
 				let self = this
 				uni.createSelectorQuery().select(classIndex).boundingClientRect((res)=>{//最外层盒子节点4
-					console.log('滚动条的高度==========>',event.scrollTop)
-					console.log('元素节点距离顶部的高度==========>', res.top)
 					if(res.dataset.index == index){
 						if( event.scrollTop == res.top ){
 							self.headTab.TabCur = index;
@@ -290,7 +286,7 @@
 			return {
 				title: '采美年中大促，折扣满满，全场低至9元~',
 				path: '/h5/pages/activity/activity_mid',
-				imageUrl:'https://admin-b.caimei365.com/userfiles/1/images/photo/2020/08/icon-share%402x.png'
+				imageUrl:'https://admin.caimei365.com/userfiles/1/images/photo/2020/08/share%402x.png'
 			}
 		},
 		onPageScroll(e){//实时获取到滚动的值
@@ -417,7 +413,7 @@
 						height:4rpx;
 						background:linear-gradient(302deg,rgba(255,255,255,1) 0%,rgba(255,255,255,0) 100%);
 						position: absolute;
-						left: 0;
+						left: 20rpx;
 						top: 50%;
 					}
 					&::after{
@@ -426,7 +422,7 @@
 						height:4rpx;
 						background:linear-gradient(302deg,rgba(255,255,255,0) 0%,rgba(255,255,255,1) 100%);
 						position: absolute;
-						right: 0;
+						right: 20rpx;
 						top: 50%;
 					}
 				}
@@ -569,7 +565,7 @@
 		width: 100%;
 		height:auto;
 		overflow: hidden;
-		background: url(https://admin-b.caimei365.com/userfiles/1/images/photo/2020/08/icon-tbabg%402x.png)no-repeat;
+		background: url(https://admin-b.caimei365.com/userfiles/1/images/photo/2020/08/tab%402x.png)no-repeat;
 		background-size: contain;
 		padding-bottom: 20rpx;
 		.home-flex-tab {

pages/login/logincode.vue

@@ -21,6 +21,7 @@
 
 <script>
 	import authorize from '@/common/config/authorize.js'
+	import wxLogin from "@/common/config/wxLogin.js"
 	import {mapState,mapMutations } from 'vuex';
 	import { invitationCodeLogin  } from '@/api/use.js'
 	export default{
@@ -31,6 +32,9 @@
 		},
 		onLoad(option) {
 
+		},
+		computed: {
+			...mapState(['isWxAuthorize','isLoginType','isLoginProductId','isLoginOrderId'])
 		},
 		methods:{
 			...mapMutations(['login']),
@@ -50,6 +54,7 @@
 						}							
 						invitationCodeLogin(params).then(response =>{
 							this.login(response.data)
+							wxLogin.wxLoginAuthorize()
 							switch(this.isLoginType){
 								case 9:
 									this.$api.navigateTo(`/h5/pages/activity/activity_mid`)
@@ -57,6 +62,9 @@
 								case 8:
 									this.$api.navigateTo(`/pages/goods/product?id=${this.isLoginProductId}`)
 									break;
+								case 7:
+									this.$api.navigateTo(`/pages/user/order/order-details?type=share&orderID=${this.isLoginOrderId}`)
+									break;
 								default:
 									this.$api.switchTabTo('/pages/tabBar/user/user')
 							}

pages/user/order/order-sharelogin.vue

@@ -5,7 +5,7 @@
 			<view class="main-list clearfix">
 				<view class="main-list-item" v-for="(item, index) in productList" :key="index">
 					<view class="item-image">
-						<image :src="item.productImage" mode="widthFix"></image>
+						<image :src="item.productImage" mode="scaleToFill"></image>
 					</view>
 					<view class="item-mesage">
 						<view class="item-name">{{item.name}}</view>