登录授权，优惠券样式、销售端提成明细

src/components/basic-component/app-layout/app-user-login/app-user-login.vue

@@ -1,26 +1,37 @@
 <template>
     <view class="login-1 dir-left-nowrap main-center cross-center" :class="showLoginModal ? 'show' : ''">
         <view class="login-content">
-            <image :src="auth_page && auth_page.pic_url" class="login-img"></image>
+            <image :src="'https://t17.9026.com/web/statics/image/index/auth-default.png'" class="login-img"></image>
             <view>
                 <app-hotspot :hotspot="auth_page.hotspot_link">
                     <button class="login-btn" @click="link"></button>
                 </app-hotspot>
             </view>
             <view>
-                <app-hotspot :hotspot="auth_page.hotspot_cancel">
-                    <button class="login-btn" @click="cancel"></button>
+                <app-hotspot :hotspot="hotspot_cancel">
+                    <button class="login-btn" @click="cancel" ></button>
                 </app-hotspot>
             </view>
+			<view>
+			    <app-hotspot :hotspot="userprivacy">
+			        <view class="main-left cross-center login-userprivacy">
+						<view class="login-userprivacy-radio" @click="isAgreeUserprivacy=!isAgreeUserprivacy" :style="{'border':`2px solid ${isAgreeUserprivacy?'#EA554D':'#CDCDCD'}`}">
+							<view class="login-userprivacy-radio-check" v-show="isAgreeUserprivacy"  @click.stop="isAgreeUserprivacy=!isAgreeUserprivacy"></view>
+						</view>
+						<text  @click="isAgreeUserprivacy=!isAgreeUserprivacy">登录即表示同意</text> 
+						<text style="color: #EE5C52;margin-left: 5rpx;" @click="$jump({'open_type':'navigate','url':'/pages/user-center/privacyAgreement/privacyAgreement'})">用户隐私协议</text>
+					</view>
+			    </app-hotspot>
+			</view>
             <view>
-                <app-hotspot :hotspot="auth_page.hotspot">
+                <app-hotspot :hotspot="hotspot">
                     <!-- #ifdef MP -->
                     <button class="login-btn" v-if="canIUseGetUserProfile"
                             scope="userInfo"
                             @click="getUserInfoClick"
                     >
                     </button>
-                    <button class="login-btn" v-else
+                    <button class="login-btn"  v-else
                             :open-type="openType"
                             scope="userInfo"
                             @getAuthorize="getUserInfo"
@@ -49,7 +60,40 @@
             appHotspot,
         },
         data() {
-            return {};
+            return {
+				isAgreeUserprivacy:false,
+				userprivacy:{
+					defaultX: "84",
+					defaultY: "560",
+					height: "80",
+					width: "450",
+					left: "84",
+					link: "",
+					open_type: "cancel",
+					top: "560",
+					
+				},
+				hotspot:{
+					defaultX: "354",
+					defaultY: "642",
+					height: "80",
+					left: "354",
+					link: "",
+					open_type: "cancel",
+					top: "642",
+					width: "224",
+				},
+				hotspot_cancel:{
+					defaultX: "72",
+					defaultY: "642",
+					height: "80",
+					left: "72",
+					link: "",
+					open_type: "cancel",
+					top: "642",
+					width: "224",
+				}
+			};
         },
         computed: {
             openType() {
@@ -129,6 +173,13 @@
             },
             // #ifdef MP
             getUserInfoClick(e) {
+				if(!this.isAgreeUserprivacy){
+					uni.showToast({
+						title:'请勾选用户隐私协议',
+						icon:'none'
+					})
+					return
+				}
 				this.$store.commit("user/showLoginModal", false);
                 // #ifdef MP-TOUTIAO
                 this.getUserInfo(e);
@@ -284,13 +335,36 @@
         .login-content {
             position: relative;
             width: #{650rpx};
-            height: #{700rpx};
+            height: #{770rpx};
         }
 
         .login-img {
             width: #{650rpx};
-            height: #{700rpx};
+            height: #{770rpx};
         }
+		.login-userprivacy{
+			font-size: 24rpx;
+			font-weight: 500;
+			color: #333333;
+			.login-userprivacy-radio{
+				width: 28rpx;
+				height: 28rpx;
+				border-radius: 50%;
+				border: 2px solid #CDCDCD;
+				margin-right: 8rpx;
+				position: relative;
+				.login-userprivacy-radio-check{
+					width: 16rpx;
+					height: 16rpx;
+					border-radius: 50%;
+					background-color: #EA554D;
+					position: absolute;
+					left: 50%;
+					top: 50%;
+					transform: translate(-50%,-50%);
+				}
+			}
+		}
     }
 
     .login-1.show {

src/components/basic-component/app-tab-bar/app-tab-bar.vue

@@ -35,24 +35,6 @@
 							"icon": "https://t17.9026.com/web/statics/image/sale/sale_home.png",
 							"id": 1,
 							"key": "",
-							// "link": {
-							// 	"icon": "https://t1.9026.com/web/statics/img/mall/pick-link/icon-cats.png",
-							// 	"id": "22",
-							// 	"name": "分类",
-							// 	"new_link_url": "/pages/cats/cats?cat_id=",
-							// 	"open_type": "navigate",
-							// 	"params": [{
-							// 		"data_type": "number",
-							// 		"desc": "请选择分类",
-							// 		"is_required": "false",
-							// 		"key": "cat_id",
-							// 		"page_url": "mall/cat/index",
-							// 		"page_url_text": "商品管理->分类",
-							// 		"value": ""
-							// 	}],
-							// 	"type": "base",
-							// 	"value": "/pages/cats/cats"
-							// },
 							"open_type": "redirect",
 							"text": "代客下单",
 							"url": "/pages/cats/cats"
@@ -69,9 +51,9 @@
 						},
 						{
 							"active_color": "#A18353",
-							"active_icon": "https://t17.9026.com/web/statics/image/sale/sale_order_select.png",
+							"active_icon": "https://t17.9026.com/web/statics/image/sale/cart_select.png",
 							"color": "#989898",
-							"icon": "https://t17.9026.com/web/statics/image/sale/sale_order.png",
+							"icon": "https://t17.9026.com/web/statics/image/sale/cart.png",
 							"id": 3,
 							"open_type": "redirect",
 							"text": "购物车",
@@ -84,18 +66,6 @@
 							"icon": "https://t17.9026.com/web/statics/image/sale/sale_my.png",
 							"id": 4,
 							"key": "",
-							// "link": {
-							// 	"icon": "https://t1.9026.com/web/statics/img/mall/pick-link/icon-user-center.png",
-							// 	"id": "24",
-							// 	"ignore": [
-							// 		"title"
-							// 	],
-							// 	"name": "用户中心",
-							// 	"new_link_url": "/pages/user-center/user-center",
-							// 	"open_type": "navigate",
-							// 	"type": "base",
-							// 	"value": "/pages/user-center/user-center"
-							// },
 							"open_type": "redirect",
 							"text": "我的",
 							"url": "/pages/sale/sale-user-center"

src/components/page-component/goods/u-attr.vue

@@ -655,7 +655,11 @@
 				if (!this.$validation.isEmpty(this.checked)) {
 					return this.checked.stock;
 				} else if (!this.$validation.isEmpty(this.goods)) {
-					return this.goods.goods_num;
+					if(this.goods.goods_num){
+						return this.goods.goods_num;
+					}else{
+						return this.goods.stock;
+					}
 				}
 			},
 			sellPrice: function() {

src/pages.json

@@ -216,6 +216,13 @@
 						"navigationBarBackgroundColor": "#fff"
 					}
 
+				}, {
+					"path": "myCommission",
+					"style": {
+						"navigationBarTitleText": "我的提成",
+						"enablePullDownRefresh": false
+					}
+
 				}
 			]
 		},
@@ -519,6 +526,13 @@
 						"navigationBarBackgroundColor": "#fff"
 					}
 
+				}, {
+					"path": "privacyAgreement/privacyAgreement",
+					"style": {
+						"navigationBarTitleText": "用户隐私协议",
+						"enablePullDownRefresh": false
+					}
+
 				}
 			]
 		},

src/pages/coupon/list/list.vue

@@ -2,7 +2,8 @@
     <app-layout>
         <view class="page">
             <view class="coupon-item" v-for="item in list" :key="item.id">
-                <image class="coupon-bg" :src="couponImg[item.is_receive == '0' ? 'coupon_enabled' : 'coupon_disabled']" ></image>
+                <!-- <image class="coupon-bg" :src="couponImg[item.is_receive == '0' ? 'coupon_enabled' : 'coupon_disabled']" ></image> -->
+				<image class="coupon-bg" src="https://t17.9026.com/web/statics/image/index/img-coupon-bg-0.png" ></image>
                 <view class="coupon-left dir-left-nowrap" @click="toDetail(item.id)">
                     <view class="coupon-price t-omit box-grow-0">
                         <template v-if="item.type == 2">
@@ -45,6 +46,7 @@
                     </view>
                 </view>
             </view>
+			
 			<app-no-goods v-if="list.length === 0" :title="'暂无可领取优惠券'" background="#f7f7f7"></app-no-goods>
         </view>
     </app-layout>
@@ -56,7 +58,78 @@ import appNoGoods from '@/components/page-component/app-no-goods/app-no-goods.vu
     export default {
         data() {
             return {
-                list: [],
+                list: [
+					   {
+					      "app_share_pic": "https://swdzshopv4.oss-cn-chengdu.aliyuncs.com/uploads/mall10000/20211129/12b320e83a7b82333ed46041acd3a4d2.jpg",
+					      "app_share_title": "分享",
+					      "appoint_type": "3",
+					      "begin_time": "",
+					      "can_receive_count": "-1",
+					      "cat": [],
+					      "couponGoods": [],
+					      "created_at": "2021-11-30 15:31:16",
+					      "deleted_at": "0000-00-00 00:00:00",
+					      "desc": "",
+					      "discount": "10.0",
+					      "discount_limit": null,
+					      "end_time": "",
+					      "expire_day": "1",
+					      "expire_type": "1",
+					      "goods": [],
+					      "id": "3",
+					      "is_delete": "0",
+					      "is_member": "0",
+					      "is_receive": "0",
+					      "mall_id": "10000",
+					      "min_price": "20000.00",
+					      "name": "满减",
+					      "page_url": "/pages/goods/list?coupon_id=3",
+					      "pic_url": "10",
+					      "rule": "",
+					      "share_type": 4,
+					      "sort": "3",
+					      "sub_price": "200.00",
+					      "total_count": "0",
+					      "type": "2",
+					      "updated_at": "2021-11-30 19:55:45",
+					      "use_obtain": "1"
+					    },
+					    {
+					      "app_share_pic": "",
+					      "app_share_title": "",
+					      "appoint_type": "3",
+					      "begin_time": "",
+					      "can_receive_count": "-1",
+					      "cat": [],
+					      "couponGoods": [],
+					      "created_at": "2021-11-30 14:22:26",
+					      "deleted_at": "0000-00-00 00:00:00",
+					      "desc": "",
+					      "discount": "10.0",
+					      "discount_limit": null,
+					      "end_time": "",
+					      "expire_day": "1",
+					      "expire_type": "1",
+					      "goods": [],
+					      "id": "1",
+					      "is_delete": "0",
+					      "is_member": "0",
+					      "is_receive": "0",
+					      "mall_id": "10000",
+					      "min_price": "131.00",
+					      "name": "优惠卷",
+					      "page_url": "/pages/goods/list?coupon_id=1",
+					      "pic_url": "10",
+					      "rule": "",
+					      "share_type": 4,
+					      "sort": "100",
+					      "sub_price": "11.00",
+					      "total_count": "-1",
+					      "type": "2",
+					      "updated_at": "2021-12-06 16:00:04",
+					      "use_obtain": "0"
+					    }
+				],
                 loading: false,
                 page: 2,
             }
@@ -203,7 +276,7 @@ import appNoGoods from '@/components/page-component/app-no-goods/app-no-goods.vu
     }
 
     .coupon-bg {
-        height: #{160rpx};
+        height: #{275rpx};
         width: 100%;
     }
 
@@ -211,7 +284,7 @@ import appNoGoods from '@/components/page-component/app-no-goods/app-no-goods.vu
         position: absolute;
         left: #{20rpx};
         top: #{30rpx};
-        color: #fff;
+        color: #282828;
         width: 70%;
     }
 

src/pages/order-submit/order-submit.vue

@@ -3,7 +3,7 @@
 		<view class="safe-area-inset-bottom">
 			<!-- 地址、商户、配送、商品、优惠、费用信息 -->
 			<view class="page" v-if="previewData">
-				<view style="background-image: url(../../static/image/index/appointment_top.png);background-size: 100% 100%;padding-bottom: 24rpx;">
+				<view style="background-image: url(https://t17.9026.com/web/statics/image/index/appointment_top.png);background-size: 100% 100%;padding-bottom: 24rpx;">
 					<app-nav-bar :fixed="true" :background-color="''" :title="'确认订单'" :xStyle="1" :hasMallSetting="2" :hasHeight="true"></app-nav-bar>
 					<template v-if="getIsEnterSales">
 						<view v-if="!customerInfo" @click="navCustomer" class="select-customer" >

src/pages/sale/components/app-my-income.vue

@@ -9,7 +9,7 @@
 			</view>
 		</view>
 		<view class="line"></view>
-		<view class="item">
+		<view class="item" @click="$jump({'open_type':'navigate','url':'/pages/sale/myCommission'})">
 			<view class="title">我的提成(万)</view>
 			<view class="main-between cross-center">
 				<view class="num">{{(userInfo.salesperson_info.order_total_commission/10000).toFixed(2)}}</view>

src/pages/sale/myCommission.vue

@@ -0,0 +1,87 @@
+<template>
+	<app-layout>
+	<view style="min-height: 100vh;background-color: #f7f7f7;padding-top: 24rpx;">
+		<view class="main-around cross-center head">
+			<view>
+				<view class="hjx-tc-777 hjx-ts-22 mb24">已发放提成</view>
+				<view class="price28 hjx-tc-B19D60 hjx-ts-50"><text>￥</text>9826</view>
+			</view>
+			<view>
+				<view class="hjx-tc-777 hjx-ts-22 mb24">未发放金额</view>
+				<view class="price28 hjx-tc-333 hjx-ts-50"><text>￥</text>346</view>
+			</view>
+		</view>
+		<view class="list">
+			<view class="cross-center hjx-ts-30 hjx-tc-666" style="padding: 32rpx 0;">
+				已发放提成<image style="width: 30rpx;height: 25rpx;margin-left: 8rpx;" src="../../static/image/sale/tcff.png" mode=""></image>
+			</view>
+			<view style="width: 100%;height: 1px;background: #EAEAEA;"></view>
+			<view class="main-between cross-center item" :class="{'item-line':true}" v-for="(item,index) in dataList" :key="index">
+				<view class="main-between-y">
+					<view class="hjx-ts-28 hjx-tc-222 hjx-tw-500">提成收入</view>
+					<view class="hjx-ts-24 hjx-tc-666 hjx-tw-500">2021-02-10 10:12:32</view>
+				</view>
+				<view class="hjx-tc-B19D60 hjx-ts-34 hjx-tw-600">￥9826</view>
+			</view>
+			<view class="no-more" v-if="isNoMore && dataList.length>0">没有更多了...</view>
+			<app-no-goods v-if="dataList.length===0" :title="`暂无提成`" background="#fff"></app-no-goods>
+		</view>
+	</view>
+	</app-layout>
+</template>
+
+<script>
+	import appNoGoods from '@/components/page-component/app-no-goods/app-no-goods.vue';
+	export default {
+		components:{
+			appNoGoods
+		},
+		data() {
+			return {
+				dataList:[],
+				isNoMore:false,
+				page:1,
+			};
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.head{
+		width: 702rpx;
+		height: 200rpx;
+		background: linear-gradient(157deg, rgba(177, 157, 96, 0.3) 0%, rgba(255, 255, 255, 0) 100%);
+		border-radius: 4rpx;
+		opacity: 0.7;
+		margin: 0 auto;
+		text-align: center;
+	}
+	.price28{
+		display: flex;
+		align-items: flex-end;
+		font-weight: 600;
+		&>text{
+			padding-bottom: 6rpx;
+			font-size: calc(100% - 22rpx);
+			font-weight: 400;
+		}
+	}
+	.mb24{
+		margin-bottom: 24rpx;
+	}
+	.list{
+		width: 702rpx;
+		height: auto;
+		background: #FFFFFF;
+		border-radius: 4rpx;
+		margin: 24rpx auto 0;
+		padding: 0 24rpx;
+		.item{
+			height: 136rpx;
+			padding: 32rpx 0;
+		}
+		.item-line{
+			border-bottom: 1rpx solid #EAEAEA;
+		}
+	}
+</style>

src/pages/sale/news/news.vue

@@ -7,7 +7,7 @@
 					周先生
 				</view> -->
 				<view class="cross-center head1">
-					<image src="../../../static/image/index/msg.png" mode=""></image>
+					<image src="https://t17.9026.com/web/statics/image/index/msg.png" mode=""></image>
 					客户楼盘绑定通知
 				</view>
 				<view class="main-between cross-center" @click="del_msg(item.id,index)">

src/pages/share/index/index.vue

@@ -7,9 +7,9 @@
 					<image class="user-avatar box-grow-0" :src="userInfo.avatar"></image>
 					<view class="box-grow-1 dir-top-nowrap main-center">
 						<view class="user-name t-omit">{{name ? name:userInfo.nickname}}</view>
-						<view class="mtb-10 t-omit">
+						<view class="mtb-10 t-omit hjx-tc-666">
 							{{custom_setting.words.parent_name.name}}：{{userInfo.identity.parent_name}}</view>
-						<view v-if="index">分销等级：{{index.level_name ? index.level_name : '无'}}</view>
+						<view v-if="index" class="hjx-tc-666">分销等级：{{index.level_name ? index.level_name : '无'}}</view>
 					</view>
 					<view class="box-grow-0" v-if="share_setting.is_show_share_level == 1"
 						@click="$jump({url: '/pages/share/level/level', open_type: 'navigate'})">升级条件</view>
@@ -539,10 +539,10 @@
 <style scoped lang="scss">
 	.info {
 		height: #{312rpx};
-		background-color: #ff4544;
+		// background-color: #ff4544;
 		width: 100%;
 		padding: #{20rpx} #{25rpx} 0;
-		color: #fff;
+	color: #333333;
 		font-size: #{28rpx};
 		background-repeat: no-repeat;
 		background-size: #{750rpx} #{312rpx};
@@ -593,10 +593,10 @@
 		height: #{56rpx};
 		line-height: #{54rpx};
 		font-size: #{28rpx};
-		color: #fff;
+		color: #333;
 		background-color: auto;
 		text-align: center;
-		border: #{2rpx} solid #fff;
+		border: #{2rpx} solid #333;
 		padding: 0;
 		margin-top: #{48rpx};
 	}

src/pages/user-center/privacyAgreement/privacyAgreement.vue

@@ -0,0 +1,145 @@
+<template>
+	<view style="min-height: 100vh;background-color: #f0f2f5;">
+		<view v-html=""></view>
+		<button class="login-btn" v-if="content" @click="login">
+			立即登录
+		</button>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				content:''
+			};
+		},
+		methods:{
+			login(e){
+				this.$store.commit("user/showLoginModal", false);
+				// #ifdef MP-TOUTIAO
+				this.getUserInfo(e);
+				// #endif
+				// #ifdef MP-WEIXIN
+				this.$user.getUserProfile(e).then(res => {
+					console.log(res)
+					this.getUserInfo(res);
+				}).catch(res => {
+					console.log(res)
+				})
+				// #endif
+			},
+			getUserInfo(e) {
+			    // #ifdef H5
+			    if (this.$jwx.isWechat()) {
+			        this.$request({
+			            url: this.$api.registered.url,
+			            method: 'get',
+			            data: {
+			                scope: 'snsapi_userinfo',
+			                response_type: 'code',
+			                url: `${window.location.href}`
+			            }
+			        }).then(res => {
+			            if (res.code === 0) {
+			                this.$storage.setStorageSync('_USER_SIGN', true);
+			                window.location.replace(res.data.url);
+			            } else {
+			                uni.navigateTo({
+			                    url: '/pages/registered/sign'
+			                });
+			            }
+			        });
+			    } else {
+			        uni.navigateTo({
+			            url: '/pages/registered/sign'
+			        });
+			    }
+			    // #endif
+			    // #ifdef MP
+			    this.$store.commit('user/showLoginModal', false);
+			    const resolve = this.$user.getUserInfoResolve;
+			    const reject = this.$user.getUserInfoReject;
+			    this.$event.on(this.$const.EVENT_USER_LOGIN, true).then(() => {
+			        this.$jump({
+			            open_type: 'reload'
+			        })
+			    });
+			    // #ifdef MP-WEIXIN
+			    if (e.detail.errMsg !== 'getUserInfo:ok') {
+			        this.$store.commit('user/showLoginModal', true);
+			        return reject(e.detail.errMsg);
+			    } else {
+			        return resolve(e);
+			    }
+			    // #endif
+			
+			    // #ifdef MP-ALIPAY
+			    my.getOpenUserInfo({
+			        success(openUserInfo) {
+			            const response = JSON.parse(openUserInfo.response);
+			            e.detail = {
+			                rawData: JSON.stringify(response.response),
+			                encryptedData: '',
+			                iv: '',
+			                signature: '',
+			            };
+			            return resolve(e);
+			        },
+			        fail(failE) {
+			            console.log('getOpenUserInfo:', failE);
+			        },
+			    });
+			    // #endif
+			
+			    // #ifdef MP-BAIDU
+			    e.detail.rawData = JSON.stringify(e.detail.userInfo);
+			    e.detail.encryptedData = '';
+			    e.detail.iv = '';
+			    e.detail.signature = '';
+			    return resolve(e);
+			    // #endif
+			
+			    // #ifdef MP-TOUTIAO
+			    uni.login({
+			        success() {
+			            uni.getUserInfo({
+			                success(result) {
+			                    e.detail = {
+			                        rawData: result.rawData,
+			                        encryptedData: '',
+			                        iv: '',
+			                        signature: '',
+			                    };
+			                    return resolve(e);
+			                },
+			                fail(e) {
+			                    console.log('getUserInfo fail:', e);
+			                },
+			            });
+			        },
+			        fail(e) {
+			            console.log('login fail:', e);
+			        },
+			    });
+			    // #endif
+			    // #endif
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.login-btn{
+		width: 678rpx;
+		height: 82rpx;
+		background: #EA554D;
+		border-radius: 41rpx;
+		margin: 20rpx auto;
+		text-align: center;
+		font-size: 30rpx;
+		font-weight: 500;
+		color: #FFFFFF;
+		line-height: 82rpx;
+	}
+</style>

src/plugins/composition/components/app-list/app-list.vue

@@ -24,7 +24,7 @@
 						        </view>
 						        <image class="item-good-attr-arrow" src="https://t17.9026.com/web/statics/image/index/arrow-right-A18353.png"></image>
 						    </view>
-							<view class="price"><text class="ought_price">￥{{goods.choose_attr?goods.choose_attr.price*goods.choose_attr.number:goods.min_price}}</text><text class="paid_price" v-show="goods.total_price">实付:￥<text>{{goods.total_price}}</text></text></view>
+							<view class="price"><text class="ought_price">￥{{goods.choose_attr?goods.choose_attr.price*goods.choose_attr.number:goods.min_price}}</text><text class="paid_price" v-show="goods.total_price>=0">实付:￥<text>{{goods.total_price}}</text></text></view>
 						</view>
 					</view>
 					<app-add-subtract :xStyle="2" :stock="goods.stock" :good_id="goods.id" :min="1" :value="goods.choose_attr.number" @change="addsubChange($event,goods,index,index1,0)"></app-add-subtract>
@@ -51,7 +51,7 @@
                             </view>
                             <image class="item-good-attr-arrow" src="https://t17.9026.com/web/statics/image/index/arrow-right-A18353.png"></image>
                         </view>
-                        <view class="price"><text class="ought_price">￥{{goods.choose_attr?goods.choose_attr.price*goods.choose_attr.number:goods.min_price}}</text><text class="paid_price" v-show="goods.total_price">实付:￥<text>{{goods.total_price}}</text></text></view>
+                        <view class="price"><text class="ought_price">￥{{goods.choose_attr?goods.choose_attr.price*goods.choose_attr.number:goods.min_price}}</text><text class="paid_price" v-show="goods.total_price>=0">实付:￥<text>{{goods.total_price}}</text></text></view>
                     </view>
 					</view>
 					<app-add-subtract :xStyle="2" :stock="goods.stock" :good_id="goods.id" :min="0" :value="goods.choose_attr.number" @change="addsubChange($event,goods,index,idx,1)"></app-add-subtract>
@@ -163,6 +163,7 @@
             // 规格选择
             check({item}) {
                 this.checked = item;
+				console.log(this.checked)
             },
             toDetail(id) {
                 uni.navigateTo({
@@ -203,6 +204,9 @@
                 })
                 that.list[that.index].host_list.forEach(v => {
                     if(v.id == that.goods.id) {
+						v.choose_attr = selectAttr;
+						!v.choose_attr.number?v.choose_attr.number=1:''
+						v.detail.selectAttr = selectAttr;
                         for(let i in selectAttr.attr_list) {
                             for(let j in v.attr_groups) {
                                 if(v.attr_groups[j].attr_group_id == selectAttr.attr_list[i].attr_group_id) {
@@ -215,8 +219,6 @@
                                 }
                             }
                         }
-                        v.choose_attr = selectAttr;
-                        v.detail.selectAttr = selectAttr;
                         v.choose_goods = true;
                         that.count();
                         that.$forceUpdate();
@@ -235,35 +237,35 @@
                 this.index = index;
                 this.attrShow = Math.random();
             },
-            choose(index,item) {
-                if(this.list[index].type == 2) {
-                    this.list[index].choose = !this.list[index].choose;
-                    for(let i in this.list[index].goods_list) {
-                        this.list[index].goods_list[i].choose_goods = this.list[index].choose
-                    }
-                    this.count();
-                    this.$forceUpdate();
-                    if (this.search) {
-                        this.$emit('search', item);
-                    }
-                }
-            },
-            chooseGoods(idx,index,item) {
-                this.list[index].goods_list[idx].choose_goods = !this.list[index].goods_list[idx].choose_goods;
-                let all = true;
-                for(let i in this.list[index].goods_list) {
-                    if(!this.list[index].goods_list[i].choose_goods) {
-                        all = false;
-                    }
-                }
-                this.list[index].choose = all;
-                this.$forceUpdate();
-                this.$emit("updateList",this.list);
-                this.count();
-                if (this.search) {
-                    this.$emit('search', item, 1);
-                }
-            },
+            // choose(index,item) {
+            //     if(this.list[index].type == 2) {
+            //         this.list[index].choose = !this.list[index].choose;
+            //         for(let i in this.list[index].goods_list) {
+            //             this.list[index].goods_list[i].choose_goods = this.list[index].choose
+            //         }
+            //         this.count();
+            //         this.$forceUpdate();
+            //         if (this.search) {
+            //             this.$emit('search', item);
+            //         }
+            //     }
+            // },
+            // chooseGoods(idx,index,item) {
+            //     this.list[index].goods_list[idx].choose_goods = !this.list[index].goods_list[idx].choose_goods;
+            //     let all = true;
+            //     for(let i in this.list[index].goods_list) {
+            //         if(!this.list[index].goods_list[i].choose_goods) {
+            //             all = false;
+            //         }
+            //     }
+            //     this.list[index].choose = all;
+            //     this.$forceUpdate();
+            //     this.$emit("updateList",this.list);
+            //     this.count();
+            //     if (this.search) {
+            //         this.$emit('search', item, 1);
+            //     }
+            // },
             count() {
                 let that = this;
                 that.total = 0;
@@ -308,11 +310,11 @@
 					for (let k = 0; k < that.list[i].host_list.length; k++) {
 						let item=that.list[i].host_list[k]
 						if(item.choose_attr) {
-							that.list[i].total_price = (+item.choose_attr.price - +item.price)*item.choose_attr.number
+							that.list[i].total_price += (+item.choose_attr.price - +item.price)*item.choose_attr.number
 							item.total_price = (+item.choose_attr.price - +item.price)*item.choose_attr.number
 							that.max_discount += (+item.price)*item.choose_attr.number
 							if(item.total_price < 0) {
-								item.total_price = 0
+								item.total_price = 0.00
 							}else {
 								item.total_price = +item.total_price.toFixed(2);
 							}
@@ -327,7 +329,7 @@
                             item.total_price = (+item.choose_attr.price - +item.price)*item.choose_attr.number
                             that.max_discount += (+item.price)*item.choose_attr.number
                             if(item.total_price < 0) {
-                                item.total_price = 0
+                                item.total_price = 0.00
                             }else {
                                 item.total_price = +item.total_price.toFixed(2);
                             }
@@ -341,7 +343,7 @@
                         }
                     }
                     if(that.list[i].total_price < 0) {
-                        that.list[i].total_price = 0
+                        that.list[i].total_price = 0.00
                     }
                     that.list[i].total_price = +that.list[i].total_price.toFixed(2);
                     that.max_discount = +that.max_discount.toFixed(2);

src/plugins/pt/order/order.vue

@@ -6,7 +6,7 @@
 		    </view>
 	        <view class="order-list">
 		        <app-order-list :theme="getTheme" @click="deleteItem" :list="list"></app-order-list>
-				<AppNoData v-if="list.length===0" :background="'#f7f7f7'" :color="'#999999'" :fixed="true" :icon="'../../../static/image/index/no-pt-order.png'" title="暂无订单"></AppNoData>
+				<AppNoData v-if="list.length===0" :background="'#f7f7f7'" :color="'#999999'" :fixed="true" :icon="'https://t17.9026.com/web/statics/image/index/no-pt-order.png'" title="暂无订单"></AppNoData>
 	        </view>
 	    </view>
     </app-layout>

src/static/css/hxj.scss

@@ -9,9 +9,16 @@
 .hjx-tc-222{
 	color: $uni-important-color-black;
 }
+
+.hjx-tc-333{
+	color: #333;
+}
 .hjx-tc-666{
 	color: $uni-general-color-one;
 }
+.hjx-tc-777{
+	color: #777;
+}
 .hjx-tc-999{
 	color: $uni-general-color-two;
 }
@@ -43,6 +50,9 @@
 .hjx-ts-34{
 	font-size: 34rpx;
 }
+.hjx-ts-50{
+	font-size: 50rpx;
+}
 
 .hjx-tw-500{
 	font-weight: 500;
@@ -87,4 +97,12 @@
 	width: 100%;
 	height: 1px;
 	background-color:#CACACA;
-}
+}
+
+.no-more {
+		font-size: 24rpx;
+		font-weight: 500;
+		color: #666666;
+		text-align: center;
+		line-height: 80rpx;
+	}