commit -m 促销活动

common/config/config.js

@@ -2,9 +2,9 @@ let URL_CONFIG = ""
 if(process.env.NODE_ENV === 'development'){
     // 开发环境
 	// URL_CONFIG = 'http://192.168.2.68:8008'	 //本地IP联调地址
-	URL_CONFIG = 'http://192.168.2.67:8008'	 //裴裴联调地址
+	// URL_CONFIG = 'http://192.168.2.67:8008'	 //裴裴联调地址
 	// URL_CONFIG = 'http://192.168.2.75:8008'	 //超超联调地址
-    // URL_CONFIG = 'https://spi-b.caimei365.com'	 //采美测试地址
+    URL_CONFIG = 'https://spi-b.caimei365.com'	 //采美测试地址
 	// URL_CONFIG = 'https://spi.caimei365.com'
 }else{
     // 生产环境

components/cm-module/creatOrder/goodsList.vue

@@ -138,7 +138,7 @@
 				height: 80rpx;
 				line-height: 80rpx;
 				.title-text{
-					width: 100%;
+					width: 400rpx;
 					overflow: hidden;
 					text-overflow:ellipsis;
 					white-space: nowrap;

components/cm-module/creatOrder/sellerGoodsList.vue

@@ -138,7 +138,7 @@
 				height: 80rpx;
 				line-height: 80rpx;
 				.title-text{
-					width: 100%;
+					width: 400rpx;
 					overflow: hidden;
 					text-overflow:ellipsis;
 					white-space: nowrap;

components/cm-module/listTemplate/buyagainList.vue

@@ -292,6 +292,7 @@
 	.list-details-price {
 		width: 100%;
 		float: left;
+		line-height: 54rpx;
 		.floor-item-act{
 			height: 54rpx;
 			text-align: center;

components/cm-module/listTemplate/productList.vue

@@ -293,6 +293,7 @@
 	}
 	.list-details-price {
 		width: 100%;
+		line-height: 54rpx;
 		.floor-item-act{
 			height: 54rpx;
 			text-align: center;

components/cm-module/orderDetails/goodsList.vue

@@ -10,7 +10,7 @@
 					<view class="title-text">{{item.shopName}}</view> 
 				</view>
 				<view class="productlist" v-for="(pros,idx) in item.orderProductList" :key="idx">
-					<view class="goods-pros-t">
+					<view class="goods-pros-t ">
 						<view class="pros-left">
 							<view class="pros-img">
 								<image :src="pros.productImage" alt="" />
@@ -60,7 +60,7 @@
 					<view class="sum">
 						<view class="sum-none" v-if="item.promotionFullReduction>0">
 							<text class="money-sign">￥</text>
-							<text class="money">{{ item.totalAmount | NumFormat }}</text>
+							<text class="money">{{ (item.totalAmount+item.promotionFullReduction) | NumFormat }}</text>
 							<text class="money-reduced">减<text>￥{{ (item.promotionFullReduction) | NumFormat}}</text></text>
 						</view>
 						<view class="sum-money" :class="item.promotionFullReduction == 0 ? 'none' : ''">
@@ -182,7 +182,6 @@
 			}	
 			.goods-pros-t{
 				display: flex;
-				align-items: center;
 				width: 100%;
 				height: auto;
 				padding: 12rpx 0;

pages/goods/cart.vue

@@ -3,7 +3,7 @@
 		<headerNavbar :systeminfo='systeminfo' :navbar-data='nvabarData' :headerBtnPosi ="headerBtnPosi" :page='1'></headerNavbar>
 		<tui-skeleton v-if="skeletonShow" backgroundColor="#fafafa" borderRadius="10rpx" :isLoading	="true" :loadingType="5"></tui-skeleton>
 		<view class="container-cart-main tui-skeleton" :style="{paddingTop:isshowDelbtn ? '0rpx':'80rpx'}">
-			<view class="foot-check-delbtn" v-if="!isshowDelbtn" :style="{top:CustomBar+'px'}">
+			<view class="foot-check-delbtn" v-if="!isshowDelbtn && goodsList.length>0" :style="{top:CustomBar+'px'}">
 				<view class="foot-text">共<text>{{kindCount}}</text>件商品</view>
 				<view class="delBtn" @tap.stop="showDelManager">删除</view>
 			</view>

pages/login/logincode.vue

@@ -55,19 +55,22 @@
 						invitationCodeLogin(params).then(response =>{
 							this.login(response.data)
 							wxLogin.wxLoginAuthorize()
-							switch(this.isLoginType){
-								case 9:
-									this.$api.navigateTo(`/h5/pages/activity/activity_mid`)
-									break;
-								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')
-							}
+							setTimeout(()=>{
+								switch(this.isLoginType){
+									case 9:
+										this.$api.navigateTo(`/h5/pages/activity/activity_mid`)
+										break;
+									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')
+								}
+							},1000)
+							
 						}).catch(error =>{
 							this.$util.msg(error.msg,2000)
 							this.isUserInfo = false

pages/search/search.vue

@@ -18,7 +18,6 @@
 				</view>
 			</view>
 		</view>
-		<!-- <go-search :theme="themeClass" @subMitSearch="subMitSearch"></go-search> -->
 		<view v-else class="commodity-list-wrapper"  :style="{'overflow':'auto','height':(listData.length>4? windowHeight + 'px' : 'auto')}">
 			<scroll-view :style="{'height':(listData.length>4? scrollHeight+'px' : 'auto')}" @scrolltolower="scrolltolower" scroll-y v-if="!showEmpty">
 				<view v-for="(item,index) in listData" :key="index" :id="item.id" class="all-type-list-content commodity-list" @click.stop="navToDetailPage(item.p_id)">
@@ -86,7 +85,6 @@
 
 <script>
 	import { mapState,mapMutations } from 'vuex'
-	import goSearch from '@/components/uni-search/go-search.vue'
 	import modalLayer from "@/components/modal-layer"
 	import uniStars from '@/components/uni-stars/uni-stars.vue'
 	import authorize from '@/common/config/authorize.js'
@@ -99,7 +97,6 @@
 	
 	export default {
 		components: {
-			// goSearch,
 			modalLayer,
 			uniStars
 		},

pages/tabBar/cart/cart.vue

@@ -2,7 +2,7 @@
 	<view class="container cart clearfix" v-if="hasLogin"> 	
 		<tui-skeleton v-if="skeletonShow" backgroundColor="#fafafa" borderRadius="10rpx" :isLoading	="true" :loadingType="5"></tui-skeleton>
 		<view class="container-cart-main tui-skeleton" :style="{paddingTop:isshowDelbtn ? '0rpx':'80rpx'}">
-			<view class="foot-check-delbtn" v-if="!isshowDelbtn">
+			<view class="foot-check-delbtn" v-if="!isshowDelbtn && goodsList.length>0">
 				<view class="foot-text">共<text>{{kindCount}}</text>件商品</view>
 				<view class="delBtn" @tap.stop="showDelManager">删除</view>
 			</view>

pages/tabBar/home/home.vue

@@ -65,12 +65,14 @@
 								<view class="title tui-skeleton-rect">
 									<text class="mclap">{{item.name}}</text>
 								</view>
-								<view class="floor-item-act" v-if="item.actStatus==1">
-									<view class="floor-tags" v-if="item.promotions.type == 1 && item.promotions.mode==1">{{item.promotions.name}}<text v-if="hasLogin">:￥{{item.price | NumFormat}}</text></view>	
-									<view class="floor-tags" v-else>{{item.promotions.name}}</view>	
-								</view>
-								<view class="floor-item-act" v-if="item.actStatus ==0  &&  item.ladderPriceFlag==1">
-									<view class="floor-tags">阶梯价格</view>	
+								<view class="floor-item-act">
+									<template v-if="item.actStatus==1">
+										<view class="floor-tags" v-if="item.promotions.type == 1 && item.promotions.mode==1">{{item.promotions.name}}<text v-if="hasLogin">:￥{{item.price | NumFormat}}</text></view>
+										<view class="floor-tags" v-else>{{item.promotions.name}}</view>	
+									</template>
+									<template v-if="item.actStatus ==0  &&  item.ladderPriceFlag==1">
+										<view class="floor-tags">阶梯价格</view>	
+									</template>	
 								</view>
 								<view class="" v-if="hasLogin">
 									<view v-if="userIdentity == 4">

pages/tabBar/user/user.vue

@@ -138,7 +138,7 @@
 	import upgradeAlert from '@/components/cm-module/modelAlert/upgradeAlert.vue'
 	import authorize from '@/common/config/authorize.js'
 	import { mapState,mapMutations } from 'vuex'
-	import { personalInfo,cancelPrompt } from "@/api/use.js"
+	import { cancelPrompt } from "@/api/use.js"
 	import { queryAfterSale } from "@/api/other.js"
 	
 	
@@ -197,7 +197,7 @@
 		methods:{
 			getUserInfo(){
 				let self = this;
-				personalInfo({userID:this.userID}).then(response =>{
+				this.UserService.PersonalInfo({userID:this.userID}).then(response =>{
 					this.$store.commit('updateAllNum',response.data.count)
 					let data =response.data
 					let $userData = data.user

pages/user/setting/setting.vue

@@ -19,7 +19,6 @@
 </template>
 
 <script>
-	import { personalInfo } from "@/api/use.js"
 	export default {
 		data() {
 			return {
@@ -32,7 +31,7 @@
 		methods:{
 			initSetting(){
 				this.$api.getStorage().then((resolve) =>{
-					personalInfo({userID:resolve.userID}).then(response =>{
+					this.UserService.PersonalInfo({userID:resolve.userID}).then(response =>{
 						this.bindMobile=response.data.user.bindMobile
 					}).catch(error =>{
 						this.$util.msg(error.msg,2000)

seller/pages/order/create-order.vue

@@ -299,7 +299,7 @@
 						productInfo.push({
 							productId:item.productID,
 							productNum:item.productCount,
-							productType:item.giftType,
+							productType:item.giftType ? Number(item.giftType) : 0,
 							presentNum:0
 						})
 					})				

seller/pages/order/order-details.vue

@@ -8,7 +8,7 @@
 			<!-- 订单信息 -->
 			<order-information ref="information" v-if="isRequest" :information="information"></order-information>
 			<!-- 商品 -->
-			<goods-list ref='goods' v-if="isRequest" :shopOrderData="shopOrderData"></goods-list>
+			<goods-list ref='goods' v-if="isRequest" :shopOrderData="shopOrderData" @popupClick="hanldePopupFn"></goods-list>
 			<!-- 发票信息 -->
 			<invoice-tent ref="invoice" v-if="isRequest" :orderInvoice="orderInvoice"></invoice-tent>
 			<!-- 转账信息 -->
@@ -38,6 +38,8 @@
 					  v-if="isShareModal"  
 					  @shareConfirm ='onShareAppMessage'>
 		</share-alert>		
+		<!-- 促销活动弹窗 -->
+		<activi-popup :Promotion="handlerPros" :popupShow="popupShow"></activi-popup>
 	</view>
 </template>
 
@@ -53,6 +55,8 @@
 	import orderButton from '@/components/cm-module/orderDetails/sellerDetaileButton'	 //底部按钮
 	import shareAlert from '@/components/cm-module/modelAlert/sellerShareAlert.vue'			 //分享弹窗
 	import orderModel from '@/components/cm-module/modelAlert/order-alert'			 //付款弹窗
+	import activiPopup from "@/components/cm-module/orderDetails/activipopu"		//促销活动弹窗
+	
 	import { queryOrderDetails,cancelOrder,deleteOrder,affirmOrder } from "@/api/order.js" 
 	export default {
 		components:{
@@ -66,7 +70,8 @@
 			refundRecord,
 			orderButton,
 			shareAlert,
-			orderModel
+			orderModel,
+			activiPopup
 		},
 		data() {
 			return {
@@ -100,6 +105,8 @@
 				systeminfo: this.setSysteminfo(),		 //获取设备信息
 				isIphoneX:this.$store.state.isIphoneX,
 				CustomBar:this.CustomBar,// 顶部导航栏高度
+				popupShow:false,
+				handlerPros:{},
 				nvabarData: {							 //顶部自定义导航
 					showCapsule: 1, // 是否显示左上角图标   1表示显示    0表示不显示
 					title: '订单详情', // 导航栏 中间的标题
@@ -228,6 +235,10 @@
 					})
 				})
 			},
+			hanldePopupFn(data){//监听活动内容
+				this.popupShow = true
+				this.handlerPros = data
+			},
 			onShareAppMessage(res){//分享转发
 				this.isShareModal = false
 				if (res.from === 'button') {

seller/pages/search/search.vue

@@ -18,7 +18,6 @@
 				</view>
 			</view>
 		</view>
-		<!-- <go-search :theme="themeClass" @subMitSearch="subMitSearch"></go-search> -->
 		<view v-else class="commodity-list-wrapper"  :style="{'overflow':'auto','height':(listData.length>4? windowHeight + 'px' : 'auto')}">
 			<scroll-view :style="{'height':(listData.length>4? scrollHeight+'px' : 'auto')}" @scrolltolower="scrolltolower" scroll-y v-if="!showEmpty">
 				<view v-for="(item,index) in listData" :key="index" :id="item.id" class="all-type-list-content commodity-list" @click.stop="navToDetailPage(item.p_id)">
@@ -80,7 +79,6 @@
 
 <script>
 	import { mapState,mapMutations } from 'vuex'
-	import goSearch from '@/components/uni-search/go-search.vue'
 	import modalLayer from "@/components/modal-layer"
 	import uniStars from '@/components/uni-stars/uni-stars.vue'
 	import authorize from '@/common/config/authorize.js'
@@ -93,7 +91,6 @@
 	
 	export default {
 		components: {
-			// goSearch,
 			modalLayer,
 			uniStars
 		},

services/ajax.env.js

@@ -2,9 +2,9 @@ let URL_CONFIG = ""
 if(process.env.NODE_ENV === 'development'){
     // 开发环境
 	// URL_CONFIG = 'http://192.168.2.68:8008'	 //本地IP联调地址
-	URL_CONFIG = 'http://192.168.2.67:8008'	 //裴裴联调地址
+	// URL_CONFIG = 'http://192.168.2.67:8008'	 //裴裴联调地址
 	// URL_CONFIG = 'http://192.168.2.75:8008'	 //超超联调地址
-    // URL_CONFIG = 'https://spi-b.caimei365.com'	 //采美测试地址
+    URL_CONFIG = 'https://spi-b.caimei365.com'	 //采美测试地址
 	// URL_CONFIG = 'https://spi.caimei365.com'
 }else{
     // 生产环境

services/user.service.js

@@ -39,4 +39,12 @@ export default class UserService {
 	DeleteNewAddress (data = {}) {
 		return this.AjaxService.get({ url:'/personalCenter/deleteAddress', data, isLoading: true })
 	}
+	/**
+	 * @机构-个人中心
+	 * @param:userId 用户ID(必传)，
+	 */
+	PersonalInfo (data = {}) {
+		return this.AjaxService.get({ url:'/personalCenter/myCentre', data, isLoading: true })
+	}
+	
 }