充值

mallApp/src/components/wangCg.vue

@@ -1,13 +1,13 @@
 <template>
-  <view class="model" v-if="loginStatus == 0">
-      <view style="color:white;font-size:36upx;margin-top:300upx;margin-bottom:30upx;">首次下单，请先登录</view>
+  <view class="model" v-if="loginStyle == 0">
+      <view style="color:white;font-size:36upx;margin-top:300upx;margin-bottom:30upx;">首次使用，请先登录</view>
       <view class="freeApply" @click="login">手机号一键登录</view>
   </view>
 </template>
 <script>
 export default {
   props: {
-    loginStatus: {
+    loginStyle: {
       type: Number,
       default: 0,
     }

mallApp/src/mixins/globalMixins.js

@@ -7,7 +7,9 @@ export default {
 			option: null,
 			constant: this.$constant,
 			$util: this.$util,
-			pageTo: pageTo
+			pageTo: pageTo,
+			//0没有登录 1有登录
+			globalLoginStyle :0
 		}
 	},
 	computed: {
@@ -21,7 +23,7 @@ export default {
 			uni.setStorageSync('token', option.token)
 		}
 
-		//扫商城二维码和会员注册码
+		//扫客户注册码、客户充值码
 		if(option.scene){
 			const scene = decodeURIComponent(option.scene)
 			var theRequest = new Object();

mallApp/src/pages/home/category.vue

@@ -41,7 +41,7 @@
       </scroll-view>
     </block>
 
-    <wangCg :loginStatus.sync="loginStatus" @goToLogin="loginTo()"></wangCg>
+    <wangCg :loginStyle.sync="globalLoginStyle" @goToLogin="loginTo()"></wangCg>
 
   </view>
 </template>
@@ -71,8 +71,6 @@ export default {
         categoryId: ''
       },
       currentTabIndex: 1,
-			//0没有登录 1有登录
-      loginStatus :0,
       myClass: 'fadeIn',
 			shopName:'',
 			shopImg:''
@@ -91,9 +89,9 @@ export default {
 	onShow(){
 		//登录状态
 		if(!this.$util.isEmpty(this.loginInfo)){
-			this.loginStyle = 1
+			this.globalLoginStyle = 1
 		}else{
-			this.loginStyle = 0
+			this.globalLoginStyle = 0
 		}
   },
 	watch: {
@@ -101,9 +99,9 @@ export default {
 			deep: true,
 			handler: function(newVal) {
 				if(!this.$util.isEmpty(newVal)){
-					this.loginStatus = 1
+					this.globalLoginStyle = 1
 				}else{
-					this.loginStatus = 0
+					this.globalLoginStyle = 0
 				}
 			},
 			immediate:true

mallApp/src/pages/home/recent.vue

@@ -2,7 +2,7 @@
   <view class="latest-content_box">
     <view class="shop-list_box" v-if="showGlInfo == 0">
 
-  <block v-if="loginStyle  == 0">
+  <block v-if="globalLoginStyle  == 0">
     <view style="width:100vw;height:500upx;display:flex;align-items:center;justify-content:center;">
       <button class="admin-button-com big blue" style="border:none;" @click="pageTo({url:'/pages/login/index'})">点我登录</button>
     </view>
@@ -106,9 +106,7 @@ export default {
     return {
       list: [],
       showGlInfo: 0,
-      ad:[{"img":`${this.$constant.imgUrl}/logo2.jpg?v=5`}],
-      //0没有登录 1有登录
-      loginStyle :0
+      ad:[{"img":`${this.$constant.imgUrl}/logo2.jpg?v=5`}]
     };
   },
   computed: {
@@ -117,17 +115,17 @@ export default {
 	watch: {
 		loginInfo(newVal) {
       if(!this.$util.isEmpty(newVal)){
-        this.loginStyle = 1
+        this.globalLoginStyle = 1
       }else{
-        this.loginStyle = 0
+        this.globalLoginStyle = 0
       }
 		}
 	},
   onShow () {
       if(!this.$util.isEmpty(this.loginInfo)){
-        this.loginStyle = 1
+        this.globalLoginStyle = 1
       }else{
-        this.loginStyle = 0
+        this.globalLoginStyle = 0
       }
       this.getShopList()
   },

mallApp/src/pages/item/detail.vue

@@ -85,25 +85,23 @@ export default {
       loginShow: false,
       showShare: false,
 			pageType: "cg",
-      autoLoad:false,
-      //0没有登录 1有登录
-      loginStyle :0
+      autoLoad:false
     };
   },
 	watch: {
 		loginInfo(newVal) {
       if(!this.$util.isEmpty(newVal)){
-        this.loginStyle = 1
+        this.globalLoginStyle = 1
       }else{
-        this.loginStyle = 0
+        this.globalLoginStyle = 0
       }
 		}
 	},
   onShow () {
       if(!this.$util.isEmpty(this.loginInfo)){
-        this.loginStyle = 1
+        this.globalLoginStyle = 1
       }else{
-        this.loginStyle = 0
+        this.globalLoginStyle = 0
       }
   },
   computed: {
@@ -179,7 +177,7 @@ export default {
       this.buyNum = e.value;
     },
     showPopup() {
-        if(this.loginStyle == 0){
+        if(this.globalLoginStyle == 0){
           let that = this
           uni.showModal({
                 title: '提示',

mallApp/src/pages/item/item.vue

@@ -117,7 +117,7 @@
 			</view>
 		</view>
 
-		<wangCg :loginStatus.sync="loginStatus" @goToLogin="loginTo()"></wangCg>
+		<wangCg :loginStyle.sync="globalLoginStyle" @goToLogin="loginTo()"></wangCg>
 
 	</view>
 </template>
@@ -127,7 +127,6 @@ import { mapGetters } from 'vuex'
 import AppTabs from "@/components/plugin/tabs";
 import Commondity from "./components/subItem";
 import wangCg from "@/components/wangCg";
-import SelPopup from "./components/sel-popup.vue";
 import AppWrapperEmpty from "./components/app-wrapper-empty";
 import GoodsCommondity from "@/components/item/module/app-goods-commodity";
 import AppSearchModule from "@/components/item/module/app-search";
@@ -150,7 +149,7 @@ export default {
 		FooterCart,
 		allMoreSelectInput,
 		GoodsCommondity,
-		wangCg,SelPopup,
+		wangCg,
 		AppActivilyCoupon
 	},
 	props: {
@@ -185,7 +184,6 @@ export default {
 			ghsId:0,
 			newCustomGift:{xrFlAmount:0},
 			isNewCustom:false,
-      		loginStatus :0,
 			cartItemShow:false,
 			shopName:'',
 			shopImg:''
@@ -204,9 +202,9 @@ export default {
 			deep: true,
 			handler: function(newVal) {
 				if(!this.$util.isEmpty(newVal)){
-					this.loginStatus = 1
+					this.globalLoginStyle = 1
 				}else{
-					this.loginStatus = 0
+					this.globalLoginStyle = 0
 				}
 			},
 			immediate:true
@@ -223,9 +221,9 @@ export default {
 
 		//登录状态
 		if(!this.$util.isEmpty(this.loginInfo)){
-			this.loginStyle = 1
+			this.globalLoginStyle = 1
 		}else{
-			this.loginStyle = 0
+			this.globalLoginStyle = 0
 		}
 
 		if(this.xjData.hasUpdate == 1){

mallApp/src/pages/login/index.vue

@@ -66,7 +66,7 @@ export default {
                 //返回上一页带参数
                 let pages = getCurrentPages();
                 let prevPage = pages[ pages.length - 2 ];
-                //修改上一页data里面的灵气
+                //修改上一页data里面的数据
                 prevPage.$vm.loginComeBack = 1
 
                 uni.navigateBack({})

mallApp/src/pages/member/recharge.vue

@@ -4,12 +4,11 @@
 			<div class="shop-logo-wrap">
 				<div class="logo-img">
 					<image class="logo" :src="`${constant.imgUrl}/logo4.png`" alt mode="widthFix" ></image>
-					<div class="title">{{ ghsInfo.name?ghsInfo.name:'' }}</div>
+					<div class="title">{{ hdInfo.name?hdInfo.name:'' }}</div>
 				</div>
 			</div>
-			<div style="padding:10upx 0 25upx 10upx;font-size:30upx;">
-				{{ customInfo.name?customInfo.name:'' }}，
-				<text>您的待结款这里直接付款销账</text>
+			<div style="padding:10upx 0 25upx 10upx;font-size:30upx;" v-if="!$util.isEmpty(customInfo)">
+				您好，{{ customInfo.name?customInfo.name:'' }}，<text>请输入金额</text>
 			</div>
 			<div class="module-com pay-input-wrap">
 				<pay-input-module :focus="inpFocus" :num="amount" @focusFn="focusFn" @blurFn="blurFn" @clickKey="clickKeyFn" />
@@ -20,362 +19,334 @@
 				<!-- #endif -->
 			</div>
 		</div>
+
+		<wangCg :loginStyle.sync="globalLoginStyle" @goToLogin="loginTo()"></wangCg>
+
 	</div>
 </template>
 <script>
-	import { mapGetters } from 'vuex'
-	import PayInputModule from './components/pay-input'
-	import wexinPay from '@/utils/pay/wxPay'
-	import ModalModule from '@/components/plugin/modal'
-	import AppCouponSel from '@/components/app-coupon-sel'
-	import { share } from '@/mixins'
-	import { rechargeBalance } from '@/api/recharge'
-	import { postWxCode } from '@/api/mini'
-	export default {
-		name: 'pay',
-		components: {
-			PayInputModule,
-			ModalModule,
-			AppCouponSel
-		},
-		mixins: [share],
-		data() {
-			return {
-				constant: this.$constant,
-				inpFocus: false,
-				amount: '',
-				payWay: 0,
-				payCallData: null,
-				id:0,
-				salt:'',
-				ghsInfo:[],
-				customInfo:[],
-				imgUrl:''
-			}
-		},
-		computed: {},
-		onLoad(option) {
-			// #ifdef H5
-			this.specialInit()
-			// #endif
+import { mapGetters } from 'vuex'
+import PayInputModule from './components/pay-input'
+import wexinPay from '@/utils/pay/wxPay'
+import ModalModule from '@/components/plugin/modal'
+import AppCouponSel from '@/components/app-coupon-sel'
+import { share } from '@/mixins'
+import { rechargeBalance } from '@/api/recharge'
+import { postWxCode } from '@/api/mini'
+import { getHdInfo } from '@/api/hd'
+import wangCg from "@/components/wangCg";
+export default {
+	name: 'pay',
+	components: {
+		PayInputModule,
+		ModalModule,
+		AppCouponSel,
+		wangCg
+	},
+	mixins: [share],
+	data() {
+		return {
+			constant: this.$constant,
+			inpFocus: false,
+			amount: '',
+			payWay: 0,
+			payCallData: null,
+			id:0,
+			salt:'',
+			hdInfo:[],
+			customInfo:[]
+		}
+	},
+	watch: {
+		loginInfo: {
+			deep: true,
+			handler: function(newVal) {
+				if(!this.$util.isEmpty(newVal)){
+					this.globalLoginStyle = 1
+				}else{
+					this.globalLoginStyle = 0
+				}
+			},
+			immediate:true
+		}
+	},
+	computed: {
+    	...mapGetters({ loginInfo:"getLoginInfo" })
+	},
+	onLoad(option) {
+		// #ifdef H5
+		this.beginInit()
+		// #endif
+	},
+	onShow(){
+		this.beginInit()
+	},
+	mounted(){
+	},
+	methods: {
+		loginTo() {
+			this.$util.pageTo({url:"/pages/login/index?needBack=1"})
 		},
-		onShow(){
-			this.specialInit()
+		teachPayFn() {
+			this.pageTo({ url: "/admin/ghs/teachPay"})
 		},
-		mounted(){
+		init(){
+			this.beginInit();
 		},
-		methods: {
-			teachPayFn() {
-				this.pageTo({ url: "/admin/ghs/teachPay"})
-			},
-			downloadImg(){
-				let that = this
-				uni.downloadFile({
-					url:that.imgUrl,
-					success: (res) => {
-						if (res.statusCode === 200) {
-							uni.saveImageToPhotosAlbum({
-							filePath: res.tempFilePath,
-							success: function (data) {
-								uni.showToast({title:'下载成功'})
-							}
-							});
-						}
-					}
-				});
-			},
-			init(){
-				this.specialInit();
-			},
-			specialInit() {
-				let that = this
-				let id = 0
-				let salt = ''
-				if(this.option.id && this.option.salt){
-					id = this.option.id?this.option.id:0
-					salt = this.option.salt?this.option.salt:''
-				}else{
-					if(this.option.q){
-						let currentUrl = decodeURIComponent(this.option.q)
-						let str = currentUrl.substring(currentUrl.lastIndexOf("?") + 1)
-						var sceneItem = str.split("&");
-						var arr, name, value;
-						var sceneArray = new Array();
-						for (var i = 0, l = sceneItem.length; i < l; i++) {
-							arr = sceneItem[i].split("=");
-							name = arr[0];
-							value = arr[1];
-							sceneArray[name] = value;
-						}
-						if(sceneArray.id){
-							id =sceneArray.id
-						}
-						if(sceneArray.salt){
-							salt = sceneArray.salt
-						}
-					}
-				}
-				this.id = id
-				this.salt = salt
-				
-				this.inpFocus = true
-				// #ifdef MP-WEIXIN
-				// 设置分享
-				let shareParams = {
-					title: `点击结账付款`,
-					desc: '',
-					imgUrl: '',
-					pagePath: `/admin/ghs/pay?id=${this.id}&salt=${this.salt}`
+		beginInit() {
+			getHdInfo().then(res=>{
+				if(res.code == 1){
+					this.hdInfo = res.data.hd ? res.data.hd : []
+					this.customInfo = res.data.custom ? res.data.custom : []
 				}
-				this.jweixinFn(shareParams)
-				console.log(`/admin/ghs/pay?id=${this.id}&salt=${this.salt}`)
-				// #endif
-			},
-			toPay() {
-				if (!this.amount) {
-					this.$msg('请先输入金额！')
+			})
+			this.inpFocus = true
+		},
+		toPay() {
+			if (!this.amount) {
+				this.$msg('请先输入金额！')
+				return false
+			}
+			let params = {}
+			params = {
+				actPrice: this.amount,
+				payWay: this.payWay,
+			}
+			let currentMiniOpenId = uni.getStorageSync('currentMiniOpenId')
+			params.currentMiniOpenId = currentMiniOpenId
+			params.ghsId = this.id
+			params.salt = this.salt
+			rechargeBalance(params).then(res => {
+				this.payCallData = res.data
+				//错误返回判断
+				if(res.code == 0){
+					this.$msg(res.msg)
 					return false
 				}
-				let params = {}
-				params = {
-					actPrice: this.amount,
-					payWay: this.payWay,
+				if (this.payWay == 0) {
+					wexinPay(res.data, this.paySuccess, this.payFail)
+				} else if (this.payWay == 1) {
+					window.location.href = res.data.url;
+				} else {
+					this.paySuccess()
 				}
-				let currentMiniOpenId = uni.getStorageSync('currentMiniOpenId')
-				params.currentMiniOpenId = currentMiniOpenId
-				params.ghsId = this.id
-				params.salt = this.salt
-				rechargeBalance(params).then(res => {
-					this.payCallData = res.data
-					//错误返回判断
-					if(res.code == 0){
-						this.$msg(res.msg)
-						return false
-					}
-					if (this.payWay == 0) {
-						wexinPay(res.data, this.paySuccess, this.payFail)
-					} else if (this.payWay == 1) {
-						window.location.href = res.data.url;
-					} else {
-						this.paySuccess()
-					}
-				})
-			},
-			focusFn() {
-				this.inpFocus = true
-			},
-			// 失焦
-			blurFn() {
-				this.inpFocus = false
-			},
-			// 点击键盘
-			clickKeyFn(val) {
-				this.amount = val
-			},
-			// 支付宝支付
-			aliPayFn() {
-				this.payWay = 1
-				this.toPay()
-			},
-			// 微信支付
-			wexinPayFn() {
+			})
+		},
+		focusFn() {
+			this.inpFocus = true
+		},
+		// 失焦
+		blurFn() {
+			this.inpFocus = false
+		},
+		// 点击键盘
+		clickKeyFn(val) {
+			this.amount = val
+		},
+		// 支付宝支付
+		aliPayFn() {
+			this.payWay = 1
+			this.toPay()
+		},
+		// 微信支付
+		wexinPayFn() {
 
-				let platformType = uni.getSystemInfoSync().platform
-				if(platformType == 'windows'){
-					this.$msg('请使用手机小程序付款')
-					return false
-				}
+			let platformType = uni.getSystemInfoSync().platform
+			if(platformType == 'windows'){
+				this.$msg('请使用手机小程序付款')
+				return false
+			}
 
-				this.payWay = 0
-				let that = this
-				let currentMiniOpenId = uni.getStorageSync('currentMiniOpenId')
-				if (this.$util.isEmpty(currentMiniOpenId)){
-					uni.showLoading({mask:true})
-					uni.login({
-						provider: 'weixin',
-						success: res => {
-						postWxCode({ code: res.code }).then(subRes => {
-							uni.hideLoading()
-							if(subRes.data.currentMiniOpenId){
-								let thisMiniOpenId = subRes.data.currentMiniOpenId
-								uni.setStorageSync('currentMiniOpenId',thisMiniOpenId)
-								that.toPay()
-							}
-						})
+			this.payWay = 0
+			let that = this
+			let currentMiniOpenId = uni.getStorageSync('currentMiniOpenId')
+			if (this.$util.isEmpty(currentMiniOpenId)){
+				uni.showLoading({mask:true})
+				uni.login({
+					provider: 'weixin',
+					success: res => {
+					postWxCode({ code: res.code }).then(subRes => {
+						uni.hideLoading()
+						if(subRes.data.currentMiniOpenId){
+							let thisMiniOpenId = subRes.data.currentMiniOpenId
+							uni.setStorageSync('currentMiniOpenId',thisMiniOpenId)
+							that.toPay()
 						}
 					})
-				}else{
-					that.toPay()
-				}				
-			},
-			paySuccess() {
-				this.$util.pageTo({url: '/admin/ghs/result?id='+this.id+'&salt='+this.salt,type: 2})
-			},
-			payFail() {
-			}
+					}
+				})
+			}else{
+				that.toPay()
+			}				
+		},
+		paySuccess() {
+			this.$util.pageTo({url: '/admin/ghs/result?id='+this.id+'&salt='+this.salt,type: 2})
+		},
+		payFail() {
 		}
 	}
+}
 </script>
 
 <style lang="scss">
-	.app-content {
-		min-height: calc(100vh - 20upx);
-		padding-top: 20upx;
-	}
-	.tabs-wrap {
-		position: fixed;
-		top: 0;
-		width: 100%;
-		height: 80upx;
-		line-height: 80upx;
-		text-align: center;
+.app-content {
+	min-height: calc(100vh - 20upx);
+	padding-top: 20upx;
+}
+.tabs-wrap {
+	position: fixed;
+	top: 0;
+	width: 100%;
+	height: 80upx;
+	line-height: 80upx;
+	text-align: center;
+	background-color: #fff;
+	font-size: 30upx;
+	box-shadow: 4upx 4upx 10upx #eee;
+}
+.pay-wrap {
+	.pay-input-wrap {
 		background-color: #fff;
-		font-size: 30upx;
-		box-shadow: 4upx 4upx 10upx #eee;
-	}
-	.pay-wrap {
-		.pay-input-wrap {
-			background-color: #fff;
-			border-top-left-radius: 20upx;
-			border-top-right-radius: 20upx;
-			padding: 50upx 80upx 28upx;
-			margin-bottom: 0 !important;
-			.balance {
-				margin-top: 30upx;
-				color: $fontColor2;
-			}
-			.btn-wrap {
-				width: 100%;
-				margin-top: 64upx;
-				.button-com {
-					display: block;
-					margin-bottom: 20upx;
-					padding-top: 30upx;
-					padding-bottom: 30upx;
-				}
-			}
-		}
-	}
-
-	// 我要配送
-	.delivery-wrap {
-		.module-com {
-			margin-bottom: 20upx;
-			background-color: #fff;
-			.module-tit {
-				padding: 20upx 18upx;
-				font-size: 28upx;
-				font-weight: 600;
-				border-bottom: 1upx solid $borderColor;
-			}
-			.module-det {
-				padding: 0 30upx;
-			}
-		}
-		// 金额
-		.pay-input-wrap {
-			padding: 50upx 36upx 38upx;
-			.balance {
-				margin-top: 30upx;
-				color: $fontColor2;
-			}
-		}
-		.shop-logo-wrap {
-			padding-bottom: 20upx;
-			@include disFlex(center, center);
-			.logo-img {
-				width: 100%;
-				margin: 10upx auto;
-				align-items: center;
-				.logo {
-					width: 100upx;
-					height:100upx;
-					border-radius: 10upx;
-					margin-left:10upx;
-					float: left;
-				}
-				.title{
-					margin-left:20upx;
-					float:left;
-					width:600upx;
-					height:100upx;
-					line-height:100upx;
-					font-size:38upx;
-					font-weight: bold;
-				}
-			}
+		border-top-left-radius: 20upx;
+		border-top-right-radius: 20upx;
+		padding: 50upx 80upx 28upx;
+		margin-bottom: 0 !important;
+		.balance {
+			margin-top: 30upx;
+			color: $fontColor2;
 		}
-		// 可选优惠
-		.discount-wrap {
-			.module-det {
-				padding-top: 20upx;
-				padding-bottom: 20upx;
-			}
-		}
-		// 匿名派送
-		.none-name-delivery {
-			// padding-left: 30upx;
-			padding: 26upx 30upx;
-			// margin-top: 40upx;
-			margin-bottom: 20upx;
-			background-color: #fff;
-			.none-name-text {
-				margin-left: 14upx;
-				color: $fontColor2;
-			}
-		}
-		// 按钮
 		.btn-wrap {
-			width: calc(100% - 60upx);
-			margin: 64upx auto 0;
-			padding-bottom: 20upx;
+			width: 100%;
+			margin-top: 64upx;
 			.button-com {
 				display: block;
 				margin-bottom: 20upx;
 				padding-top: 30upx;
 				padding-bottom: 30upx;
-				&:last-child {
-					margin-bottom: 0;
-				}
 			}
 		}
+	}
+}
 
-		// 查看更多
-		.view-more {
-			width: auto;
-			padding-bottom: 20upx;
-			margin-bottom: 20upx;
+// 我要配送
+.delivery-wrap {
+	.module-com {
+		margin-bottom: 20upx;
+		background-color: #fff;
+		.module-tit {
+			padding: 20upx 18upx;
 			font-size: 28upx;
-			@include disFlex(center, center);
-			background-color: #fff;
-			color: #666565;
-			justify-content: flex-start;
-			z-index:9999999;
-			.view-more-text {
-				margin-right: 14upx;
-			}
-			padding-left:40upx;
-			i {
-				font-size: 30upx;
-				font-weight: 600;
-			}
-			.fill-get-man{
-				color:red;
+			font-weight: 600;
+			border-bottom: 1upx solid $borderColor;
+		}
+		.module-det {
+			padding: 0 30upx;
+		}
+	}
+	// 金额
+	.pay-input-wrap {
+		padding: 50upx 36upx 38upx;
+		.balance {
+			margin-top: 30upx;
+			color: $fontColor2;
+		}
+	}
+	.shop-logo-wrap {
+		padding-bottom: 20upx;
+		@include disFlex(center, center);
+		.logo-img {
+			width: 100%;
+			margin: 10upx auto;
+			align-items: center;
+			.logo {
+				width: 100upx;
+				height:100upx;
+				border-radius: 10upx;
 				margin-left:10upx;
-				font-weight:600;
-				text-decoration:underline;
+				float: left;
 			}
-			.pack-up{
+			.title{
 				margin-left:20upx;
-				font-weight:600;
-				color:red;
-				text-decoration:underline;
+				float:left;
+				width:600upx;
+				height:100upx;
+				line-height:100upx;
+				font-size:42upx;
+				font-weight: bold;
 			}
-			&.open {
-				i {
-					transform: rotate(180deg);
-				}
+		}
+	}
+	// 可选优惠
+	.discount-wrap {
+		.module-det {
+			padding-top: 20upx;
+			padding-bottom: 20upx;
+		}
+	}
+	// 匿名派送
+	.none-name-delivery {
+		// padding-left: 30upx;
+		padding: 26upx 30upx;
+		// margin-top: 40upx;
+		margin-bottom: 20upx;
+		background-color: #fff;
+		.none-name-text {
+			margin-left: 14upx;
+			color: $fontColor2;
+		}
+	}
+	// 按钮
+	.btn-wrap {
+		width: calc(100% - 60upx);
+		margin: 64upx auto 0;
+		padding-bottom: 20upx;
+		.button-com {
+			display: block;
+			margin-bottom: 20upx;
+			padding-top: 30upx;
+			padding-bottom: 30upx;
+			&:last-child {
+				margin-bottom: 0;
+			}
+		}
+	}
+
+	// 查看更多
+	.view-more {
+		width: auto;
+		padding-bottom: 20upx;
+		margin-bottom: 20upx;
+		font-size: 28upx;
+		@include disFlex(center, center);
+		background-color: #fff;
+		color: #666565;
+		justify-content: flex-start;
+		z-index:9999999;
+		.view-more-text {
+			margin-right: 14upx;
+		}
+		padding-left:40upx;
+		i {
+			font-size: 30upx;
+			font-weight: 600;
+		}
+		.fill-get-man{
+			color:red;
+			margin-left:10upx;
+			font-weight:600;
+			text-decoration:underline;
+		}
+		.pack-up{
+			margin-left:20upx;
+			font-weight:600;
+			color:red;
+			text-decoration:underline;
+		}
+		&.open {
+			i {
+				transform: rotate(180deg);
 			}
 		}
 	}
+}
 </style>

mallApp/src/pages/order/list.vue

@@ -26,7 +26,7 @@
     <block v-else>
       <app-wrapper-empty title="暂无记录" :is-empty="$util.isEmpty(list.data)" />
     </block>
-		<wangCg :loginStatus.sync="loginStatus" @goToLogin="loginTo()"></wangCg>
+		<wangCg :loginStyle.sync="globalLoginStyle" @goToLogin="loginTo()"></wangCg>
   </div>
 </template>
 <script>
@@ -46,7 +46,6 @@ export default {
   mixins: [list],
   data() {
     return {
-      loginStatus:0,
       loginComeBack:0
     };
   },
@@ -74,9 +73,9 @@ export default {
 			deep: true,
 			handler: function(newVal) {
 				if(!this.$util.isEmpty(newVal)){
-					this.loginStatus = 1
+					this.globalLoginStyle = 1
 				}else{
-					this.loginStatus = 0
+					this.globalLoginStyle = 0
 				}
 			},
 			immediate:true