11111

mer_uniapp/components/WaterfallsFlowItem/WaterfallsFlowItem.vue

@@ -17,6 +17,9 @@
 				<text v-if="item.auditStatus == 0" class="approval_info">通过后将展示在列表</text>
 			</view>
 			<view class='texts'>
+				<view class='names box-line2 flex-between-center' v-if="userFair && item.title">
+					{{!userFair ? '' : item.title}}
+				</view>
 				<view class='names box-line2 flex-between-center'>
 					<text v-if="item.productTags && item.productTags.locationLeftTitle.length" class="font-bg-red mr10 bg-color merType">{{item.productTags.locationLeftTitle[0].tagName}}</text>
 					{{!userFair ? item.name : item.content}}

mer_uniapp/pages/goods/goods_details/index.vue

@@ -395,7 +395,7 @@
 			<!-- 脚部按钮 -->
 			<!-- 管理 -->
 			<view class="footer acea-row row-between-wrapper" :class="dataItem ? 'flex-between-center-sc' : ''">
-				<view class="manageCount" v-if="isManage">
+				<view class="manageCount" v-if="isManage && dataItem.saleStatus !== 1">
 					<view class="follow_btn author-focused flex-around-center" @click.stop="handleManage">
 						<view class="line-heightOne">管理</view>
 					</view>
@@ -463,7 +463,7 @@
 									立即购买
 								</button>
 							</form>
-							<form @submit="goSecondHand" report-submit="true" v-if="dataItem.authorId !== uid">
+							<form @submit="goSecondHand" report-submit="true" >
 								<button style="border-radius: 0;" :class="productInfo.systemFormId == 0 ? 'bnts' : 'longBnts'" class="buy"
 								 form-type="submit">
 									立即购买

mer_uniapp/pages/goods/goods_list/index.vue

@@ -127,7 +127,7 @@
 				<image :src="urlDomain+'crmebimage/presets/noSearch.png'"></image>
 			</view>
 			<text class="text-ccc">{{tabIndex===1?'暂无商品~':'暂无店铺~'}}</text>
-			<recommend v-if="!merId || !fairCateId" ref="recommendIndex" class="mt-40"></recommend>
+			<recommend v-if="!merId && !fairCateId" ref="recommendIndex" class="mt-40"></recommend>
 			<recommend v-if="fairCateId" :dynamics="true" :tabActive="tabActive" ref="recommendIndex" class="mt-40"></recommend>
 		</view>
 
@@ -223,8 +223,8 @@
 				keyword: '',
 				rangeArr: [
 					{id: 0, range: 'school', name: '本校'},
-					{id: 1, range: 'school', name: '同城'},
-					{id: 2, range: 'school', name: '全国'},
+					{id: 1, range: 'city', name: '同城'},
+					{id: 2, range: 'all', name: '全国'},
 				],
 				rangeStr: '',
 				tabActive: null,
@@ -335,6 +335,10 @@
 				this.tabActive = item.id;
 				this.rangeStr = item.range;
 				this.showCateDrawer = false;
+				this.where.page = 1;
+				this.loadend = false;
+				this.loading = false;
+				this.get_product_list(true);
 			},
 			goStore(id) {
 				uni.navigateTo({

mer_uniapp/pages/goods/order_confirm/index.vue

@@ -676,11 +676,10 @@
 					};
 
 					console.log(this.orderInfoVo, '11111111111111111111111')
-					this.isAddress = Number(this.orderInfoVo.secondType) < 5 && Number(this.orderInfoVo.secondType) !== 2 && Number(
-						this.orderInfoVo.type) != 2;
+					this.isAddress = Number(this.orderInfoVo.secondType) < 5 && Number(this.orderInfoVo.secondType) !== 2 && Number(this.orderInfoVo.type) != 2;
 
 					orderInfoVo.merchantInfoList.map(item => {
-						if (item.shippingType == 2) this.isAddress = false;
+						if (item.shippingType == 2) this.isAddress = false; //  && this.orderType !== 'secondHand'
 						this.orderMerchantRequestList.push({
 							shippingType: item.shippingType,
 							merId: item.merId,

mer_uniapp/pages/goods/order_details/index.vue

@@ -113,6 +113,21 @@
 							</view>
 						</view>
 					</view>
+					<view v-if="orderType == 'secondHand' && item.shippingType == 2">
+						<view class="map borRadius14">
+							<view class='title item acea-row row-between-wrapper'>
+								<view>自提地址信息</view>
+								<view class="place cart-color acea-row row-center-wrapper" @tap="showMaoLocation(item)">
+									<text class="iconfont icon-weizhi"></text>查看位置
+								</view>
+							</view>
+							<view class="address">
+								<view class='name' @tap="makePhone(item.merPhone)">{{item.merName}}<text class='phone'>{{item.merPhone}}</text><text
+									 class="iconfont icon-tonghua font-color"></text></view>
+								<view>{{item.merAddressDetail}}</view>
+							</view>
+						</view>
+					</view>
 					<view class="borRadius14 orderGoodsBox">
 						<orderGoods :orderInfo="item" :orderNo="orderNo" :cartInfo="item.orderInfoList" :jump="true" :orderData="orderInfo"
 						 :secondType="orderInfo.secondType"></orderGoods>
@@ -258,8 +273,9 @@
 					<view class='bnt cancel' v-show="Number(orderInfo.status) >1 &&Number(orderInfo.status) < 9 && orderInfo.status!=3&&shippingType===1"
 					 @tap='godeliverRecord'>发货记录
 					</view>
-					<view class='bnt bg_color' v-show="orderInfo.status==4 && orderInfo.refundStatus!==3 || orderType == 'secondHand' && shippingType == 2 && orderInfo.status == 1"
-					 @tap='confirmOrder'>确认收货</view>
+					<view class='bnt bg_color' v-show="orderType !== 'secondHand' && orderInfo.status==4 && orderInfo.refundStatus!==3" @tap='confirmOrder'>确认收货</view>
+					<view class='bnt bg_color' v-show="orderType == 'secondHand' && shippingType == 2 && orderInfo.status == 1 && orderInfo.uid == uid" @tap='confirmOrder'>确认收货</view>
+					<view class='bnt bg_color' v-show="orderType == 'secondHand' && shippingType == 1 && orderInfo.status == 4 && orderInfo.uid == uid" @tap='confirmOrder'>确认收货</view>
 					<view class='bnt bg_color' v-show="orderType == 'secondHand' && shippingType == 1 && orderInfo.status == 1 && orderInfo.sellerId == uid"
 					 @tap='confirmFHOrder'>确认发货</view>
 					<view class='bnt cancel' v-show="orderInfo.status==6 || orderInfo.status==9" @tap='delOrder'>删除订单
@@ -609,6 +625,10 @@
 						return item.shippingType === 1
 					})
 					that.isUserAddress = that.userAddress.length > 0 ? true : false;
+					if (that.orderType == 'secondHand' && data.merchantOrderList[0].shippingType == 2) {
+						that.isUserAddress = true;
+						that.userAddress = data.merchantOrderList;
+					}
 					if (data.status !== 0 || data.status !== 9) {
 						if (data.merchantOrderList[0].shippingType == 2) that.markCode(data.merchantOrderList[
 							0].verifyCode);

mer_uniapp/pages/trade_fair/trade_fair_user/index.vue

@@ -445,7 +445,7 @@
 				if (that.loaded || that.loading) return;
 				that.loading = true;
 				that.loadTitle = '';
-				that.where.status = -1;
+				that.where.status = 1;
 				secondHandOrderList(that.where).then(res => {
 					let list = res.data.list;
 					let goods = that.$util.SplitArray(list, that.list);