调整

addons/unishop/uniapp/uni-shop/App.vue

@@ -51,7 +51,7 @@
 
 <style lang='scss'>
 	body {
-		max-width: 375px;
+		max-width: 750px;
 		margin: 0 auto;
 	}
 

addons/unishop/uniapp/uni-shop/components/Progress-Bar/Progress-Bar.vue

@@ -15,7 +15,7 @@ export default {
 	props: {
 		// 已卖多少件
 		Sold: {
-			type: Number,
+			type: Number|String,
 			default: 0
 		},
 		// 进度条宽度

addons/unishop/uniapp/uni-shop/pages.json

@@ -64,13 +64,13 @@
 				"navigationBarTitleText": "Modify Information"
 			}
 		}, 
-		// {
-		// 	"path": "pages/cart/cart",
-		// 	"style": {
-		// 		"enablePullDownRefresh": true,
-		// 		"navigationBarTitleText": "购物车"
-		// 	}
-		// },
+		{
+			"path": "pages/cart/cart",
+			"style": {
+				"enablePullDownRefresh": true,
+				"navigationBarTitleText": "购物车"
+			}
+		},
 		{
 			"path": "pages/public/login",
 			"style": {
@@ -270,12 +270,12 @@
 			// 	"selectedIconPath": "static/tab-cate-current.png",
 			// 	"text": "Catagory"
 			// },
-			// {
-			// 	"pagePath": "pages/cart/cart",
-			// 	"iconPath": "static/tab-cart.png",
-			// 	"selectedIconPath": "static/tab-cart-current.png",
-			// 	"text": "购物车"
-			// },
+			{
+				"pagePath": "pages/cart/cart",
+				"iconPath": "static/tab-cart.png",
+				"selectedIconPath": "static/tab-cart-current.png",
+				"text": "购物车"
+			},
 			{
 				"pagePath": "pages/user/user",
 				"iconPath": "static/tab-my.png",

addons/unishop/uniapp/uni-shop/pages/order/order.vue

@@ -45,7 +45,7 @@
 						<view class="action-box b-t" v-if="item.state != 9">
 							<button class="action-btn" v-if="item.state == 1" @click.stop="button('cancel',item)">Cancel</button>
 							<button class="action-btn recom" v-if="item.have_paid == 0" @click.stop="button('pay',item)">Pay Immediately</button>
-							<button class="action-btn recom" v-if="item.state == 2" @click.stop="button('refunded',item)">Refund</button>
+							<!-- <button class="action-btn recom" v-if="item.state == 2" @click.stop="button('refunded',item)">Refund</button> -->
 							<!-- <button class="action-btn" v-if="item.have_paid != 0 && item.have_delivered == 0">提醒发货</button> -->
 							<!-- <button class="action-btn" v-if="item.have_paid != 0" @click.stop="button('delivery',item)">查看物流</button> -->
 							<!-- <button class="action-btn" v-if="item.have_paid != 0 && item.have_received == 0" @click.stop="button('recerved',item)">确认收货</button> -->
@@ -89,13 +89,13 @@
 						orderList: [],
 						page: 1
 					},
-					{
-						state: 2,
-						text: 'Unshipped',
-						loadingType: 'more',
-						orderList: [],
-						page: 1
-					},
+					// {
+					// 	state: 2,
+					// 	text: 'Unshipped',
+					// 	loadingType: 'more',
+					// 	orderList: [],
+					// 	page: 1
+					// },
 					// {
 					// 	state: 3,
 					// 	text: 'Shipped',
@@ -104,14 +104,14 @@
 					// 	page: 1
 					// },
 					{
-						state: 3,
+						state: 2,
 						text: 'Completed',
 						loadingType: 'more',
 						orderList: [],
 						page: 1
 					},
 					{
-						state: 4,
+						state: 3,
 						text: 'Cancelled',
 						loadingType: 'more',
 						orderList: [],
@@ -167,7 +167,7 @@
 				navItem.loadingType = 'loading';
 
 				let result = await this.$api.request('/order/getOrders', 'GET', {
-					type: state == 3 ? '4' : state == 4 ? '5' : state,
+					type: state == 2 ? '4' : state == 3 ? '5' : state,
 					page: navItem.page,
 					pagesize: this.pageSize
 				});
@@ -437,13 +437,13 @@
 						orderList: [],
 						page: 1
 					},
-					{
-						state: 2,
-						text: 'Unshipped',
-						loadingType: 'more',
-						orderList: [],
-						page: 1
-					},
+					// {
+					// 	state: 2,
+					// 	text: 'Unshipped',
+					// 	loadingType: 'more',
+					// 	orderList: [],
+					// 	page: 1
+					// },
 					// {
 					// 	state: 3,
 					// 	text: 'Shipped',
@@ -452,14 +452,14 @@
 					// 	page: 1
 					// },
 					{
-						state: 3,
+						state: 2,
 						text: 'Completed',
 						loadingType: 'more',
 						orderList: [],
 						page: 1
 					},
 					{
-						state: 4,
+						state: 3,
 						text: 'Cancelled',
 						loadingType: 'more',
 						orderList: [],

addons/unishop/uniapp/uni-shop/pages/order/orderDetail.vue

@@ -56,7 +56,7 @@
 		<view class="bottom" v-if="order.state != 9">
 			<button class="action-btn" v-if="order.state == 1" @click.stop="button('cancel')">Cancel</button>
 			<button class="action-btn recom" v-if="order.have_paid == 0" @click.stop="button('pay')">Pay Immediately</button>
-			<button class="action-btn recom" v-if="order.state == 2" @click.stop="button('refunded',item)">Refund</button>
+			<!-- <button class="action-btn recom" v-if="order.state == 2" @click.stop="button('refunded',item)">Refund</button> -->
 			<!-- <button class="action-btn" v-if="order.have_paid != 0" @click.stop="button('delivery')">查看物流</button> -->
 			<!-- <button class="action-btn" v-if="order.have_paid != 0 && order.have_received == 0" @click.stop="button('recerved')">确认收货</button> -->
 			<!-- <button class="action-btn" v-if="order.have_paid != 0" @click.stop="button('refund')">申请售后</button> -->

addons/unishop/uniapp/uni-shop/pages/product/product.vue

@@ -74,7 +74,7 @@
 				</view>
 				<text class="yticon icon-you"></text>
 			</view>
-			<view class="c-row b-b" @click="toggleCoupon" v-if="product.coupon.length">
+			<view class="c-row b-b" @click="toggleCoupon" v-if="product.coupon&&product.coupon.length">
 				<text class="tit">优惠券</text>
 				<text class="con t-r red">查看可用优惠券</text>
 				<text class="yticon icon-you"></text>
@@ -113,7 +113,7 @@
 			<view class="d-header">
 				<text>图文详情</text>
 			</view>
-			<rich-text :nodes="product.desc"></rich-text>
+			<rich-text class="rich-text-a" :nodes="product.desc"></rich-text>
 		</view>
 
 		<!-- 底部操作菜单 -->
@@ -122,11 +122,11 @@
 				<text class="yticon icon-fangzi"></text>
 				<text>Home</text>
 			</navigator>
-			<!-- <navigator url="/pages/cart/cart" open-type="switchTab" class="p-b-btn">
+			<navigator url="/pages/cart/cart" open-type="switchTab" class="p-b-btn">
 				<text class="yticon icon-gouwuche"></text>
 				<text>购物车</text>
 				<text class="cart-count" v-if="product.cart_num">{{product.cart_num}}</text>
-			</navigator> -->
+			</navigator>
 			<view class="p-b-btn" :class="{active: favorite}" @click="toFavorite" v-if="!flash">
 				<text class="yticon icon-shoucang"></text>
 				<text>收藏</text>
@@ -481,7 +481,9 @@
 		background: $page-color-base;
 		padding-bottom: 160upx;
 	}
-
+	.rich-text-a{
+		font-size: 19px;
+	}
 	.icon-you {
 		font-size: $font-base + 2upx;
 		color: #888;
@@ -969,12 +971,12 @@
 	.page-bottom {
 		position: absolute;
 		left: 30upx;
+		right: 30upx;
 		bottom: 30upx;
 		z-index: 95;
 		display: flex;
 		justify-content: center;
 		align-items: center;
-		width: 690upx;
 		height: 100upx;
 		background: rgba(255, 255, 255, .9);
 		box-shadow: 0 0 20upx 0 rgba(0, 0, 0, .5);

addons/unishop/uniapp/uni-shop/pages/user/user.vue

@@ -50,22 +50,22 @@
 					<text class="num" v-if="orderNum.unpaid > 0">{{orderNum.unpaid}}</text>
 					<text>Unpayment</text>
 				</view>
-				<view class="order-item" @click="$api.navTo('/pages/order/order?state=2')" hover-class="common-hover"  :hover-stay-time="50">
+				<!-- <view class="order-item" @click="$api.navTo('/pages/order/order?state=2')" hover-class="common-hover"  :hover-stay-time="50">
 					<text class="yticon icon-daifahuo"></text>
 					<text class="num" v-if="orderNum.undelivered > 0">{{orderNum.undelivered}}</text>
 					<text>Unshipped</text>
-				</view>
+				</view> -->
 				<!-- <view class="order-item" @click="$api.navTo('/pages/order/order?state=3')" hover-class="common-hover"  :hover-stay-time="50">
 					<text class="yticon icon-daishouhuo"></text>
 					<text class="num" v-if="orderNum.unreceived > 0">{{orderNum.unreceived}}</text>
 					<text>Shipped</text>
 				</view> -->
-				<view class="order-item" @click="$api.navTo('/pages/order/order?state=3')" hover-class="common-hover"  :hover-stay-time="50">
+				<view class="order-item" @click="$api.navTo('/pages/order/order?state=2')" hover-class="common-hover"  :hover-stay-time="50">
 					<text class="yticon icon-pingjia"></text>
 					<text class="num" v-if="orderNum.uncomment > 0">{{orderNum.uncomment}}</text>
 					<text>Completed</text>
 				</view>
-				<view class="order-item" @click="$api.navTo('/pages/order/order?state=4')" hover-class="common-hover"  :hover-stay-time="50">
+				<view class="order-item" @click="$api.navTo('/pages/order/order?state=3')" hover-class="common-hover"  :hover-stay-time="50">
 					<text class="yticon icon-shouhou"></text>
 					<text class="num" v-if="orderNum.refund > 0">{{orderNum.refund}}</text>
 					<text>Cancelled</text>

addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/index.html

@@ -1,3 +1,3 @@
 <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1"><title>宜家自购商城</title><script>document.addEventListener('DOMContentLoaded', function() {
 				document.documentElement.style.fontSize = document.documentElement.clientWidth / 20 + 'px'
-			})</script><link rel=stylesheet href=/h5/static/index.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script>/*BAIDU_STAT*/</script><script src=/h5/static/js/chunk-vendors.6724f06c.js></script><script src=/h5/static/js/index.bc7d6232.js></script></body></html>
+			})</script><link rel=stylesheet href=/h5/static/index.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script>/*BAIDU_STAT*/</script><script src=/h5/static/js/chunk-vendors.e7876d6b.js></script><script src=/h5/static/js/index.8bf16446.js></script></body></html>