Merge branch 'youmengting-dev' of http://gitea.dctpay.com/yangjie/high-mini into new-dev

components/goods-list/goods-list.vue

@@ -121,7 +121,7 @@
 
 
 		<!-- 购物车 -->
-		<view :class="' gouwuche '+(typeList=='goodsSearch'?' searchCart ':' ') " @click.prevent="goCart">
+		<view :class="' gouwuche searchCart ' " @click.prevent="goCart">
 			<!-- cartNum -->
 			<uniBadge class="uni-badge-left-margin badgeClass" max-num="99" :text="cartNum+''" type="warning"
 				size="small" />

components/search/search.vue

@@ -5,7 +5,10 @@
 				<view class="search icon icon-color icon-font"></view>
 			</view>
 			
-            <input type="text" :disabled="disableInput" confirm-type="search" class="round " :placeholder="propPlaceholder" :placeholder-class="propPlaceholderClass" v-model="keywords" @confirm="search_input_event" style="color:#666;background:#ffffff;">
+            <input type="text" :disabled="disableInput" confirm-type="search" class="round " :placeholder="propPlaceholder" :placeholder-class="propPlaceholderClass" v-model="keywords" @confirm="search_input_event" :style="'color:#666;background:'+inputBg+';'">
+			<view v-if="isShowdel" class="del-icon  search-icon  pa" @click="del_input_event">
+				<view v-if="isDel" class="font15 icon-color font20">×</view>
+			</view>
 		</view>
     </view>
 </template>
@@ -16,6 +19,7 @@
         data() {
             return {
 				keywords:"",
+				isDel:false,
 			};
         },
         components: {},
@@ -35,6 +39,14 @@
 			disableInput:{
 				type: Boolean,
 				default: false
+			},
+			inputBg:{
+				type: String,
+				default: '#ffffff'
+			},
+			isShowdel:{
+				type: Boolean,
+				default: false
 			}
             
         },
@@ -46,6 +58,18 @@
 		// 		immediate:true 
 		// 	}
 		// },
+		watch:{
+			keywords:{
+				handler(n,o){
+					if(n){
+						this.isDel = true;
+					}else{
+						this.isDel = false;
+					}
+				},
+				immediate:true 
+			}
+		},
         methods: {
             // 搜索事件
             search_input_event() {
@@ -62,6 +86,10 @@
                 }
                 this.$emit('onsearch', this.keywords);//回调
             },
+			del_input_event(){
+				this.keywords = "" 
+				 this.$emit('ondel',this.keywords);//回调
+			},
             
         },
 		destroyed() {
@@ -70,6 +98,10 @@
     };
 </script>
 <style>
+	.del-icon{
+		right: 0;
+		top: 0;
+	}
 	
 	.cr-grey{
 		display: flex;
@@ -109,7 +141,7 @@
 	
     .search-content .round {
         font-size: 16px;
-        padding: 0 15px 0 30px;
+        padding: 0 30px;
         box-sizing: border-box;
         height: 40px;
         line-height: 40px;

pages.json

@@ -1092,7 +1092,7 @@
 				{
 					"path": "classify/goods-search/goods-search",
 					"style": {
-						"navigationBarTitleText": "搜索",
+						"navigationBarTitleText": "商品列表",
 						"enablePullDownRefresh": false,
 						"navigationBarBackgroundColor": "#3da7e7",
 						"backgroundColorTop": "#3da7e7",

physical-merchants/classify/cart/cart.vue

@@ -220,7 +220,7 @@
 							mask:true,
 							duration:2000
 						});
-						console.log(20)
+						// console.log(20)
 					}
 				getShoppingCartList().then(res => {
 					if(!status){
@@ -498,9 +498,29 @@
 
 			},
 			goClassify(){
-				uni.reLaunch({
+				var pages = getCurrentPages();
+				 pages.reverse()
+				let index = -1;
+				pages.map((item,ind)=>{
+					if(item.route == 'pages/tabBar/classify/classify'){
+						index = ind ;
+						return
+					}
+				}) 
+				
+				if(index == -1){
+					uni.navigateTo({
 						url:'/pages/tabBar/classify/classify'
 					})
+					
+					return
+				}
+				
+				uni.navigateBack({
+					delta:index
+				})
+				
+				
 			},
 
 		}

physical-merchants/classify/goods-search/goods-search.vue

@@ -4,7 +4,7 @@
 			<!-- 搜索框 -->
 			<block>
 				<view class="nav-search jianbian">
-					<component-search @onsearch="search_button_event" :propIsOnEvent="true" :propIsRequired="true"
+					<component-search @onsearch="search_button_event"  :propIsRequired="false"
 						propPlaceholder="输入商品名称搜索"></component-search>
 				</view>
 			</block>
@@ -27,6 +27,8 @@
 	import {
 		getListGoodsDetail
 	} from '@/Utils/physicalObject.js' 
+	
+	const app = getApp()
 	export default {
 
 		data() {
@@ -40,7 +42,20 @@
 					allData: 0 //总共有多少条数据
 				},
 				
+				companyId :app.globalData.companyId,
+				goodsLabel:''
+
+			}
+		},
+		onLoad(options){
+			console.log(options,"options") 
+			
+			if(options.goodsLabel){
+				this.goodsLabel = options.goodsLabel	
 			}
+			
+			this.search_button_event("")
+			
 		},
 		components: {
 			componentSearch,
@@ -56,6 +71,7 @@
 		methods: {
 			//搜索事件
 			search_button_event(keywords) {
+				if(keywords==null){keywords=''}
 				this.keywordsSearh = keywords;
 				this.data_list = [];
 				this.page = {
@@ -77,21 +93,23 @@
 			// 加载数据
 			searchData() {
 
-				if (!this.keywordsSearh) {
-					uni.showToast({
-						title: '请输入商品名称',
-						duration: 1000,
-						icon: 'none'
-					});
+				// if (!this.keywordsSearh) {
+				// 	uni.showToast({
+				// 		title: '请输入商品名称',
+				// 		duration: 1000,
+				// 		icon: 'none'
+				// 	});
 
-					return
-				}
+				// 	return
+				// }
 				let _this = this
 				let params = {
 					title: _this.keywordsSearh,
 					pageNum: _this.page.pageStart,
 					pageSize: _this.page.pageNum,
-					price: 0
+					price: 0,
+					companyId:_this.companyId,
+					goodsLabel:_this.goodsLabel
 				}
 				// params = JSON.stringify(params) 
 				// console.log(params)

physical-merchants/classify/order/orderDetail.vue

@@ -87,13 +87,13 @@
 
 			<!-- 商品金额 -->
 			<view class="flex-center-sp pd-tb10">
-				<view class="">商品金额</view>
+				<view class="fontsize">商品金额</view>
 				<view class="fontwig6"><text class="paddtright5">¥</text>{{goodsPrice | numFormat}}</view>
 			</view>
 			
 			<!-- 运费 -->
 			<view class="flex-center-sp pd-tb10">
-				<view class="">运费
+				<view class="fontsize">运费
 					<!-- <text class="icon-ymt question fcor666 font16 paddleft5"></text> -->
 				</view>
 				<view class="fontwig6">
@@ -106,7 +106,7 @@
 			
 			<!-- 优惠券 -->
 			<view class="flex-center-sp pd-tb10">
-				<view class="">优惠券</view>
+				<view class="fontsize">优惠券</view>
 				<view class="fontwig6 fcorred">-<text class="paddtright5">¥</text>{{recinfo.deductionCouponPrice}}
 				</view>
 			</view>
@@ -115,13 +115,13 @@
 
 			<!-- 积分 -->
 			<view class="flex-center-sp pd-tb10">
-				<view class="">积分抵扣</view>
+				<view class="fontsize">积分抵扣</view>
 				<view class="fontwig6 fcorred">-<text class="paddtright5">¥</text>{{(recinfo.payGold / 100).toFixed(2)}}
 				</view>
 			</view>
 			<!--支付优惠 -->
 			<view class="flex-center-sp pd-tb10">
-				<view class="">支付优惠</view>
+				<view class="fontsize">支付优惠</view>
 				<view class="fontwig6 fcorred">-<text class="paddtright5">¥</text>0</view>
 			</view>
 			<!-- 价格总额 -->
@@ -164,7 +164,7 @@
 
 			<!-- 收货信息 -->
 			<view v-if="recinfo.goodsDeliveryAddress" class="flex-center-sp pd-tb10 bordert">
-				<view class=" align-fs width80px">收货信息</view>
+				<view class="fontsize align-fs width80px">收货信息</view>
 				<view class="fcor666 flex-1 tr font16">
 					<view class=" ">
 						{{recinfo.goodsDeliveryAddress.regionName +' '+recinfo.goodsDeliveryAddress.address}}</view>
@@ -174,14 +174,14 @@
 			</view>
 			<!-- 物流信息 -->
 			<view class="flex-center-sp pd-tb10 ">
-				<view class=" width80px">物流信息</view>
+				<view class="fontsize width80px">物流信息</view>
 				<view class="fcor666 font16 " @click="checkWuliu">
 					查看物流信息<text class="icon-ymt to-right fcor666 font16 paddleft5"></text>
 				</view>
 			</view>
 			<!-- 订单编号 -->
 			<view class="flex-center-sp pd-tb10 ">
-				<view class=" width80px">订单编号</view>
+				<view class="fontsize width80px">订单编号</view>
 				<view class="fcor666 flex-center-sp font16">
 					<text class="tr flex-1">{{orderId}}</text>
 					<text class=" margle10 font12 copy-num fcor666" @click="copyText(orderId)">复制</text>
@@ -189,14 +189,14 @@
 			</view>
 			<!-- 下单时间 -->
 			<view class="flex-center-sp pd-tb10 ">
-				<view class=" width80px">下单时间</view>
+				<view class="fontsize width80px">下单时间</view>
 				<view class="font16 fcor666">
 					{{recinfo.createTime | formatDate('-')}}
 				</view>
 			</view>
 			<!-- 支付方式 -->
 			<view class="flex-center-sp pd-tb10 ">
-				<view class=" width80px">支付方式</view>
+				<view class="fontsize width80px">支付方式</view>
 				<view class="font16 fcor666">
 					<view class=" fotrt " v-if="recinfo.payType == 1">支付宝</view>
 					<view class=" fotrt " v-if="recinfo.payType == 2">微信支付</view>
@@ -207,7 +207,7 @@
 			</view>
 			<!-- 备注 -->
 			<view class="flex-center-sp pd-tb10 ">
-				<view class=" width80px">备注</view>
+				<view class="fontsize width80px">备注</view>
 				<view class="fcor666 font16 ">
 					{{recinfo.remarks || "无"}}
 				</view>
@@ -218,7 +218,7 @@
 		
 			<!-- 收货信息 -->
 			<view v-if="recinfo.goodsDeliveryAddress" class="flex-center-sp pd-tb10 bordert">
-				<view class=" align-fs width80px">收货信息</view>
+				<view class="fontsize align-fs width80px">收货信息</view>
 				<view class="flex-1 tr fcor666 font16">
 					<view class=" ">
 						{{recinfo.goodsDeliveryAddress.regionName +' '+recinfo.goodsDeliveryAddress.address}}</view>
@@ -228,7 +228,7 @@
 			</view>
 			<!-- 订单编号 -->
 			<view class="flex-center-sp pd-tb10 ">
-				<view class=" width80px">订单编号</view>
+				<view class="fontsize width80px">订单编号</view>
 				<view class="fcor666 flex-center-sp font16">
 					<text class="tr flex-1">{{orderId}}</text>
 					<text class=" margle10 font12 copy-num fcor666" @click="copyText(orderId)">复制</text>
@@ -236,14 +236,14 @@
 			</view>
 			<!-- 下单时间 -->
 			<view class="flex-center-sp pd-tb10 ">
-				<view class=" width80px ">下单时间</view>
+				<view class="fontsize width80px ">下单时间</view>
 				<view class="font16 fcor666">
 					{{recinfo.createTime | formatDate('-')}}
 				</view>
 			</view>
 			<!-- 备注 -->
 			<view class="flex-center-sp pd-tb10 ">
-				<view class=" width80px ">备注</view>
+				<view class="fontsize width80px ">备注</view>
 				<view class="fcor666 font13 font16">
 					{{recinfo.remarks || "无"}}
 				</view>
@@ -567,6 +567,11 @@
 </script>
 
 <style lang="scss" scoped>
+	
+	.fontsize{
+		font-size: 16px;
+	}
+	
 	.bottomstu {
 		position: fixed;
 		bottom: 0px;

physical-merchants/classify/order/paymentResult.vue

@@ -83,8 +83,10 @@
 				})
 			},
 			orderDetail(){
+				// console.log(this.orderId)
 				uni.redirectTo({
-					url:"/pages/user/order_list/order_list?tbIndex="+'-1'
+					// url:"/pages/user/order_list/order_list?tbIndex="+'-1'
+					url:"/physical-merchants/classify/order/orderDetail?id="+this.orderId
 				})
 			},
 			yaoqin(){

physical-merchants/settleAccounts/settleAccounts.vue

@@ -306,7 +306,7 @@
 					return 0;
 				}
 			},
-			//小计金额,不含积分
+			//小计金额
 			priceSettle() {
 				let priceAll = Number(this.priceAll); //商品金额
 				let priceOrigin = Number(this.priceOrigin); //商品原价
@@ -373,6 +373,9 @@
 				} else {
 					let num = 0;
 					this.discountList.map(item => {
+						if(item.useEndTime<(new Date()).getTime()){
+							
+						}else{
 							if (item.discountType == 1) {
 								if (this.priceAll >= item.discountCondition) {
 									num += 1;
@@ -380,6 +383,9 @@
 							} else if (item.discountType == 2 || item.discountType == 3) { //3：折扣券，2：直抵20元
 								num += 1;
 							}
+						}
+						
+						
 					})
 
 					return num;
@@ -747,6 +753,14 @@
 							
 							return
 						}
+						// 
+						if(_this.priceSettle ==0){
+							uni.redirectTo({
+								url: "/physical-merchants/classify/order/paymentResult?id=" + res.return_data.orderNo
+							});
+							return
+						}
+						// 
 						
 						uni.redirectTo({
 							url: '/physical-merchants/classify/order/pay?obj=' + obj