3-5

pages/money/pay.vue

@@ -45,7 +45,10 @@
 import { balance } from '@/api/wallet.js';
 import { createOrderkey,computedOrderkey,orderPay } from '@/api/order.js';
 import { mapState,mapMutations } from 'vuex';
-import { orderData, userinfo } from '@/api/user.js';
+import { orderData, userinfo } from '@/api/user.js';
+// #ifdef H5
+import weixinObj from '@/plugin/jweixin-module/index.js';
+// #endif
 export default {
 	data() {
 		return {
@@ -191,7 +194,7 @@ export default {
 						};
 						// #ifdef H5
 						if(obj.payName == 'weixin'){
-						obj.weichatObj.chooseWXPay(data);
+						weixinObj.chooseWXPay(data);
 						}
 						// #endif
 						// #ifdef MP-WEIXIN

pages/order/order.vue

@@ -77,6 +77,11 @@ export default {
 	components: {
 		uniLoadMore,
 		empty
+	},
+	filters: {
+		moneyNum(value){
+			return +value;
+		},
 	},
 	data() {
 		return {
@@ -188,9 +193,10 @@ export default {
 			});
 		},
 		// 订单支付
-		orderPay(e) {
+		orderPay(e) {
+			console.log(e)
 			uni.navigateTo({
-				url: '/pages/money/pay?type=1&ordid=' + e.order_id + '&money=' + e.pay_price
+				url: '/pages/money/pay?type=1&ordid=' + e.order_id + '&money=' + e.pay_price + '&isP=' + (e.combination_id != 0 ? '1': '0')
 			});
 		},
 		//获取订单列表

pages/order/orderRefund.vue

@@ -87,7 +87,8 @@ export default {
 			});
 		},
 		//提交
-		confirm() {
+		confirm() {
+			let obj = this;
 			if (!obj.refund) {
 				uni.showModal({
 					title: '错误',
@@ -96,7 +97,6 @@ export default {
 				});
 				return false;
 			}
-			let obj = this;
 			refund({
 				text: obj.refund,
 				uni: obj.orderId,

pages/user/user.vue

@@ -124,34 +124,34 @@
 							<view class="icon"><image class="icon-img" src="/static/icon/u3.png" mode="aspectFit"></image></view>
 							<text>积分明细</text>
 						</view>
-						<view class="order-item" @click="navTo('/pages/order/order?state=4')" hover-class="common-hover" :hover-stay-time="50">
+						<!-- <view class="order-item" @click="navTo('/pages/order/order?state=4')" hover-class="common-hover" :hover-stay-time="50">
 							<view class="icon"><image class="icon-img" src="/static/icon/u4.png" mode="aspectFit"></image></view>
 							<text>通用币</text>
-						</view>
+						</view> -->
 					</view>
 				</view>
 
 				<!-- 浏览历史 -->
 				<view class="history-section icon">
-					<view class="sec-header">
+					<!-- <view class="sec-header">
 						<text class="iconfont iconfavor"></text>
 						<text>浏览历史</text>
-					</view>
-					<scroll-view scroll-x class="h-list">
+					</view> -->
+					<!-- <scroll-view scroll-x class="h-list">
 						<image
 							class="h-list-image"
 							@click="navTo('/pages/product/product')"
 							src="https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1553105186633&di=c121a29beece4e14269948d990f9e720&imgtype=0&src=http%3A%2F%2Fimg004.hc360.cn%2Fm8%2FM04%2FDE%2FDE%2FwKhQplZ-QteEBvsbAAAAADUkobU751.jpg"
 							mode="aspectFill"
 						></image>
-					</scroll-view>
+					</scroll-view> -->
 					<uni-list>
 						<uni-list-item title="我的钱包" @click="navTo('/pages/money/wallet')" thumb="/static/icon/img11.png"></uni-list-item>
 						<uni-list-item title="我的卡卷" @click="navTo('/pages/user/coupon')" thumb="/static/icon/img12.png"></uni-list-item>
 						<uni-list-item title="我的收藏" @click="navTo('/pages/user/favorites')" thumb="/static/icon/img02.png"></uni-list-item>
-						<uni-list-item title="商户入驻" @click="navTo('/pages/set/address')" thumb="/static/icon/img05.png"></uni-list-item>
+						<uni-list-item title="收货地址" @click="navTo('/pages/set/address')" thumb="/static/icon/img05.png"></uni-list-item>
 						<uni-list-item title="邀请好友" @click="navTo('/pages/user/shareQrCode')" thumb="/static/icon/img10.png"></uni-list-item>
-						<uni-list-item title="关于我们" @click="navTo('/pages/shareQrCode/index')" thumb="/static/icon/img09.png"></uni-list-item>
+						<!-- <uni-list-item title="关于我们" @click="navTo('/pages/shareQrCode/index')" thumb="/static/icon/img09.png"></uni-list-item> -->
 					</uni-list>
 				</view>
 			</view>

unpackage/dist/build/h5/index.html

@@ -1,6 +1,2 @@
 <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>响亮商城</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
-<<<<<<< HEAD
-            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/index/static/index.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.fd8e0a16.js></script><script src=/index/static/js/index.fbde1233.js></script></body></html>
-=======
-            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/index/static/index.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.520954c1.js></script><script src=/index/static/js/index.18db8cbc.js></script></body></html>
->>>>>>> 36454b703a427b7eecd45bbd3f7a0b56c9aa477d
+            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/index/static/index.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.fd8e0a16.js></script><script src=/index/static/js/index.9b9dd0f4.js></script></body></html>