丽格V1.0.1

components/uni-search/bt-search.vue

@@ -1,67 +0,0 @@
-<template name="bt-search">
-	<view class="search-input">
-		<template>
-			<view class="gosearch-btn" @click="this.$api.navigateTo(clickPath)">
-				<text class="iconfont icon-iconfonticonfontsousuo1"></text>
-				<text>{{toestText}}</text>
-			</view>
-		</template>
-	</view>
-</template>
-
-<script>
-	export default{
-		name:"bt-search",
-		props:{
-			clickPath:{	//选择块级显示还是圆形显示
-				type: String,
-				default: ''
-			},
-			toestText:{
-				type: String,
-				default: ''
-			}
-		},
-		data() {
-			return {
-				
-			};
-		},
-		methods:{
-			
-		}
-	}	
-</script>
-
-<style lang="scss">
-	.search-input{
-		width: 100%;
-		height: 70rpx;
-		padding: 12rpx 0;
-		background: #FFFFFF;
-		.gosearch-btn{
-			/* #ifndef APP-NVUE */
-			display: flex;
-			/* #endif */
-			flex: 1;
-			flex-direction: row;
-			justify-content: center;
-			align-items: center;
-			width: 662rpx;
-			height: 100%;
-			border-radius: 40rpx;
-			background: #F0F0F0;
-			margin: 0 auto;
-			padding:0 20rpx;
-			font-size: 28rpx;
-			line-height: 70rpx;
-			color: #8A8A8A;
-			.icon-iconfonticonfontsousuo1{
-				margin:0 6rpx;
-				font-size: 34rpx;
-				color: #8A8A8A;
-				z-index: 10;
-			}
-		}
-	}
-</style>

manifest.json

@@ -71,7 +71,8 @@
         "navigateToMiniProgramAppIdList" : [ "wx5a5cda32926f55ac" ],
         "uniStatistics" : {
             "enable" : true
-        }
+        },
+		"lazyCodeLoading": "requiredComponents"
     },
     "mp-alipay" : {
         "usingComponents" : true

pages/goods/components/cm-unit-popup.vue

@@ -24,7 +24,7 @@
 							</view>
 						</view>
 					</view>
-					<view class="sku-unit-nunbox">
+					<view class="sku-unit-nunbox" v-if="userIdentity!=1">
 						<view class="sku-unit-nunbox-t">
 							<view class="sku-unit-nunbox-text">购买数量:</view>
 							<view class="sku-unit-nunbox-num">
@@ -52,6 +52,7 @@
 					</view>
 				</view>
 				<view
+					v-if="userIdentity!=1"
 					class="tui-right-flex tui-popup-btn"
 					:style="{ paddingBottom: isIphoneX ? '68rpx' : '34rpx' }"
 				>
@@ -108,6 +109,10 @@ export default {
 			type: Boolean,
 			default: false
 		},
+		userIdentity: {
+			type: Number,
+			default: 1
+		},
 		type: {
 			type: Number,
 			default: 1

pages/goods/product.vue

@@ -179,6 +179,7 @@
 			:type="unitPopupType"
 			:btnType="btnType"
 			:goodsData="goodsData"
+			:userIdentity="userIdentity"
 			@buyConfirm="handleBuyConfirm"
 			@skuClick="handleSkuClick"
 		/>

pages/seller/goods/list.vue

@@ -135,7 +135,7 @@ export default {
 		}
 	},
 	onLoad() {
-		this.initGetStotage()
+		
 	},
 	filters: {
 		NumFormat: function(value) {
@@ -309,7 +309,9 @@ export default {
 			uni.stopPullDownRefresh()
 		}, 200)
 	},
-	onShow() {}
+	onShow() {
+		this.initGetStotage()
+	}
 }
 </script>
 

pages/seller/index/components/hotmode.vue

@@ -33,10 +33,13 @@
 	
 		},
 		methods:{
-		
-			handleProcurement() {
-				//跳转集采列表
-				this.$api.navigateTo(`/pages/goods/procurement`)
+			//跳转集采列表
+			async handleProcurement() {
+				const userInfo = await this.$api.getStorage()
+				if(userInfo.userIdentity  === 1){
+					this.$util.msg('发布需求功能暂不对机构以外的身份开放~', 2000)
+					return
+				}
             },
 			handleActivi(){
 				this.$api.navigateTo(`/pages/goods/good-floor?id=${floor.id}`)

pages/seller/order/components/cm-goods-temp.vue

@@ -18,9 +18,6 @@
 						<view class="pros-product">
 							<view class="producttitle">{{ pros.name }}</view>
 							<view class="productspec" v-if="pros.productCategory != 2">规格:{{ pros.unit }}</view>
-							<view class="productspec" v-if="pros.productCode != '' && pros.productCode != null">
-								<view>商品编码:{{ pros.productCode }}</view>
-							</view>
 							<view class="productprice">
 								<view class="price"
 									><text>￥{{ pros.price | NumFormat }}</text></view

pages/seller/order/components/details/cm-goods-temp.vue

@@ -2,23 +2,14 @@
 	<view class="goods-template">
 		<!-- 商品列表 -->
 		<view class="goods-list clearfix">
-			<view v-for="(item, index) in dataList" :key="index" class="goods-item clearfix">
+			<view class="goods-item clearfix">
 				<view class="shoptitle">
-					<view v-if="item.shopPromotion" class="floor-item-act">
-						<view class="floor-tags" @click.stop="clickPopupShow(item.shopPromotion)">{{
-							item.shopPromotion.name
-						}}</view>
-					</view>
-					<view class="title-text" v-if="orderInfo.secondHandOrderFlag == 1"
-						>{{ item.shopName }}
-						<label class="paymenttext" v-if="orderInfo.affirmPaymentFlag == 1">已确认打款供应商</label>
-					</view>
-					<view class="title-text" v-else @click="goShophome(item)">
-						{{ item.shopName }} <label class="iconfont icon-jinrudianpu"></label>
+					<view class="title-text">
+						{{ orderInfo.shopName }} <label class="iconfont icon-jinrudianpu"></label>
 					</view>
 				</view>
 				<view class="productlist">
-					<view class="goods-pros-t " @click="details(item)">
+					<view class="goods-pros-t " v-for="(item, index) in dataList" :key="index"  @click="details(item)">
 						<view class="pros-left">
 							<view class="pros-img">
 								<image :src="item.image" alt="" />
@@ -27,9 +18,6 @@
 						</view>
 						<view class="pros-product">
 							<view class="producttitle">{{ item.name }}</view>
-							<view class="productspec product-view" v-if="item.productCategory != 2"
-								>规格：{{ item.productUnit ? item.productUnit : '' }}</view
-							>
 							<view class="product-view">
 								<view
 									class="view-num red"
@@ -72,23 +60,6 @@
 							</view>
 						</view>
 					</view>
-					<view class=" product-info clearfix"> 
-						<view class="product-view" v-if="item.returnedNum > 0 || item.actualCancelNum > 0">
-							<view class="view-num">已退货/已取消：<text class="text">{{ item.returnedNum }}/{{ item.actualCancelNum }}</text></view>
-						</view>
-<!-- 						<view class="product-view" v-if="item.svipPriceType != 1">
-							<view class="view-num">折扣：<text class="text">{{ item.discount == null ? '0' : item.discount }}%</text></view>
-						</view> -->
-						<view class="product-view">
-							<view class="view-num">税率：<text class="text">{{ item.taxRate }}%</text></view>
-						</view>
-						<!-- <view class="product-view">
-							<view class="view-num">折后单价：<text class="text">￥{{ item.discountPrice | NumFormat }}</text></view>
-						</view> -->
-						<view class="product-view allPrice">
-							<view class="view-num">合计：<text class="text">￥{{ item.totalFee | NumFormat }}</text></view>
-						</view>
-					</view>
 				</view>
 				<view class="goods-pros-m" v-if="orderInfo.note">
 					<view class="m-text">留言:</view>
@@ -101,7 +72,7 @@
 				<view class="goods-pros-b clearfix">
 					<view class="pros-price-view">
 						<view class="price-view-le">商品总额：</view>
-						<view class="price-view-ri">￥{{ orderInfo.totalAmount | NumFormat }}</view>
+						<view class="price-view-ri">￥{{ orderInfo.productAmount | NumFormat }}</view>
 					</view>
 					<view class="pros-price-view">
 						<view class="price-view-le">运费：</view>

pages/seller/order/components/details/cm-order-temp.vue

@@ -9,13 +9,6 @@
 					</view>
 				</view>
 			</view>
-			<view class="information-view same">
-				<view class="view-man">
-					赠品总数：<label class="label">{{
-						orderData.presentNum
-					}}</label>
-				</view>
-			</view>
 			<view class="information-view">
 				<view class="view-num time">
 					下单时间：<label class="label">{{ orderData.orderTime ? orderData.orderTime : '' }}</label>

pages/seller/order/order-details.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="container details clearfix">
+	<view class="container details clearfix"  :style="{ paddingBottom: isIphoneX ? 130 + 68 + 'rpx' : '130rpx' }">
 <!-- 		自定义返回
 		<header-back
 			:systeminfo="systeminfo"
@@ -436,8 +436,8 @@ export default {
 			}
 			return {
 				title: '您有新的订单，请点击查看~',
-				path: `/pages/user/order/order-sharelogin?orderId=${this.orderId}&userId=${
-					this.userId
+				path: `/pages/user/order/order-sharelogin?shopOrderId=${this.shopOrderId}&userId=${
+					this.clubUserId
 				}&serviceProviderId=${this.serviceProviderId}`,
 				imageUrl: 'https://static.caimei365.com/app/mini-mcare/icon/icon_shareOrder@2x.png'
 			}
@@ -585,6 +585,7 @@ page {
 	.view-type {
 		float: left;
 		color: #ff2a2a;
+		font-weight: bold;
 	}
 	.status-visible {
 		float: left;

pages/seller/order/order-list.vue

@@ -277,7 +277,6 @@
 <script>
 import { mapState, mapMutations } from 'vuex'
 import headerBack from '@/components/cm-module/headerNavbar/header-back' //自定义顶部导航
-import btSearch from '@/components/uni-search/bt-search.vue' //搜索
 import modalLayer from '@/components/modal-layer'
 import empty from './components/empty'
 import cmListButton from './components/cm-list-button' //操作按钮
@@ -289,7 +288,6 @@ export default {
 	components: {
 		headerBack,
 		empty,
-		btSearch,
 		modalLayer,
 		cmListButton,
 		cmSharePopup,
@@ -420,6 +418,7 @@ export default {
 		async getOrderDatainit(index, source) {
 			try {
 				this.listQuery.pageNum = 1
+				this.listQuery.listType = index
 				let orderItem = this.orderTabBar[index]
 				if (source === 'tabChange' && orderItem.loaded === true) {
 					//tab切换只有第一次需要加载数据

pages/user/order/components/details/cm-goods-temp.vue

@@ -2,14 +2,14 @@
 	<view class="goods-template">
 		<!-- 商品列表 -->
 		<view class="goods-list">
-			<view v-for="(pros, index) in dataList" :key="index" class="goods-item clearfix">
+			<view class="goods-item clearfix">
 				<view class="shoptitle">
 					<view class="title-text">
-						{{ pros.shopName }}
+						{{ orderInfo.shopName }}
 					</view>
 				</view>
 				<view class="productlist">
-					<view class="goods-pros-t" @click="details(pros)">
+					<view class="goods-pros-t"  v-for="(pros, index) in dataList" :key="index"  @click="details(pros)">
 						<view class="pros-left">
 							<view class="pros-img">
 								<image :src="pros.image" alt="" />
@@ -17,9 +17,6 @@
 						</view>
 						<view class="pros-product">
 							<view class="producttitle">{{ pros.name }}</view>
-							<view class="productspec product-view" v-if="pros.productCategory != 2"
-								>规格：{{ pros.productUnit ? pros.productUnit : '' }}</view
-							>
 							<view class="product-view">
 								<view class="view-num red">￥{{ pros.price | NumFormat }}</view>
 								<view class="view-num right">x {{ pros.num }}</view>
@@ -36,7 +33,7 @@
 				<view class="goods-pros-b clearfix">
 					<view class="pros-price-view">
 						<view class="price-view-le">商品总额：</view>
-						<view class="price-view-ri">￥{{ orderInfo.totalAmount | NumFormat }}</view>
+						<view class="price-view-ri">￥{{ orderInfo.productAmount | NumFormat }}</view>
 					</view>
                     <view class="pros-price-view" @click="popupShow = true">
                     	<view class="price-view-le">运费：</view>

pages/user/order/order-addpay.vue

@@ -61,7 +61,7 @@ export default {
 	},
 	onLoad(option) {
 		console.log(option)
-		this.params.shopOrderId = option.orderId
+		this.params.shopOrderId = option.shopOrderId
 	},
 	computed: {
 		disabled() {

pages/user/order/order-details.vue

@@ -28,35 +28,35 @@
 						orderInfo.orderSubmitType == 2"
 					>自主</text>
 			</view>
-			<!-- 地址选择 -->
+			<!-- 地址信息 -->
 			<cm-address-temp ref="orderAddress" v-if="skeletonShow" :addressData="addressData" />
-			<!-- 商品 -->
+			<!-- 商品信息 -->
 			<cm-goods-temp ref="goods" v-if="skeletonShow" :list="orderInfo.orderProductList" :orderInfo="orderInfo" />
 			<!-- 订单信息 -->
 			<cm-order-temp ref="information" v-if="skeletonShow" :information="orderInfo" />
 			<!-- 发票信息 -->
 			<cm-invice-temp ref="invoice" v-if="skeletonShow" :orderInvoice="orderInvoice" />
-			<!-- 支付记录 -->
+			<!-- 支付信息 -->
 			<cm-payment-temp
 				ref="payment"
 				v-if="skeletonShow && discernReceiptList"
 				:discernReceiptList="discernReceiptList"
 				:receiptAmount="receiptAmount"
 			/>
-			<!-- 退款记录 -->
+			<!-- 退款信息 -->
 			<cm-refund-temp
 				ref="refund"
 				v-if="skeletonShow"
 				:returnedPurchaseList="returnedPurchaseList"
 				:returnedPurchaseFee="returnedPurchaseFee"
 			/>
-			<!-- 支付凭证记录 -->
+			<!-- 凭证信息 -->
 			<cm-voucher-temp
 				ref="voucher"
 				v-if="skeletonShow && voucherList && voucherList.length > 0"
 				:list="voucherList"
 			/>
-			<!-- 底部button -->
+			<!-- 底部按钮 -->
 			<cm-details-button
 				ref="orderButton"
 				v-if="skeletonShow"
@@ -144,7 +144,6 @@ export default {
 			},
 			state: 0,
 			userId: '',
-			orderId: '',
 			shopOrderId: '',
 			shareCode: '', //分享码
 			shareType: '', //分享登录页过来记录的状态
@@ -189,7 +188,6 @@ export default {
 	onLoad(option) {
 		console.log(option)
 		this.shareType = option.type
-		this.orderId = option.orderId
 		this.shopOrderId = option.shopOrderId
 		if (this.shareType === 'share') {
 			this.state = 0
@@ -241,7 +239,7 @@ export default {
 				const data = res.data
 				this.skeletonShow = true
 				this.orderInfo = data.shopOrder
-				// this.shareCode = data.shareCode
+				this.shareCode = data.shareCode
 				this.addressData = data.userInfo
 				this.btnStatus = data.shopOrder.status
 				this.payStatus = data.shopOrder.payStatus
@@ -291,10 +289,10 @@ export default {
 					this.getOrderPaymentValidation()
 					break
 				case 'query':
-					this.$api.navigateTo('/pages/user/order/order-logistics?orderId=' + this.shopOrderId)
+					this.$api.navigateTo('/pages/user/order/order-logistics?shopOrderId=' + this.shopOrderId)
 					break
 				case 'upload':
-					this.$api.navigateTo('/pages/user/order/order-addpay?orderId=' + this.shopOrderId)
+					this.$api.navigateTo('/pages/user/order/order-addpay?shopOrderId=' + this.shopOrderId)
 					break
 			}
 		},
@@ -549,6 +547,7 @@ page {
 	.view-type {
 		float: left;
 		color: #ff2a2a;
+		font-weight: bold;
 	}
 	.bage-buss {
 		display: inline-block;

pages/user/order/order-list.vue

@@ -168,7 +168,6 @@
 
 <script>
 import headerBack from '@/components/cm-module/headerNavbar/header-back' //自定义导航
-import btSearch from '@/components/uni-search/bt-search.vue' //搜索
 import cmListButton from './components/cm-list-button' //按钮
 import modalLayer from '@/components/modal-layer'
 import empty from './components/empty'
@@ -178,7 +177,6 @@ export default {
 	components: {
 		headerBack,
 		empty,
-		btSearch,
 		modalLayer,
 		cmListButton,
 		cmSharePopup
@@ -378,7 +376,7 @@ export default {
 			//上拉加载
 			try {
 				this.listQuery.pageNum += 1
-				this.listQuery.orderState = this.orderTabBar[index].state
+				this.listQuery.orderState = index
 				const res = await this.OrderService.QueryOrderList(this.listQuery)
 				const data = res.data
 				const orderItem = this.orderTabBar[index]

pages/user/order/order-sharedetails.vue

@@ -8,35 +8,35 @@
 			:loadingType="5"
 		/>
 		<template v-else>
-			<!-- 地址选择 -->
+			<!-- 地址信息 -->
 			<cm-address-temp ref="orderAddress" v-if="skeletonShow" :addressData="addressData" />
-			<!-- 商品 -->
-				<cm-goods-temp ref="goods" v-if="skeletonShow" :list="orderInfo.orderProductList" :orderInfo="orderInfo" />
+			<!-- 商品信息 -->
+			<cm-goods-temp ref="goods" v-if="skeletonShow" :list="orderInfo.orderProductList" :orderInfo="orderInfo" />
 			<!-- 订单信息 -->
 			<cm-order-temp ref="information" v-if="skeletonShow" :information="orderInfo" />
 			<!-- 发票信息 -->
 			<cm-invice-temp ref="invoice" v-if="skeletonShow" :orderInvoice="orderInvoice" />
-			<!-- 支付记录 -->
+			<!-- 支付信息 -->
 			<cm-payment-temp
 				ref="payment"
 				v-if="skeletonShow"
 				:discernReceiptList="discernReceiptList"
 				:receiptAmount="receiptAmount"
 			/>
-			<!-- 退款记录 -->
+			<!-- 退款信息 -->
 			<cm-refund-temp
 				ref="refund"
 				v-if="skeletonShow"
 				:returnedPurchaseList="returnedPurchaseList"
 				:returnedPurchaseFee="returnedPurchaseFee"
 			/>
-			<!-- 支付凭证记录 -->
+			<!-- 凭证信息 -->
 			<cm-voucher-temp
 				ref="voucher"
 				v-if="skeletonShow && voucherList && voucherList.length > 0"
 				:list="voucherList"
 			/>
-			<!-- 底部button -->
+			<!-- 底部按钮 -->
 			<view class="button-content" :style="{ paddingBottom: isIphoneX ? '68rpx' : '34rpx' }">
 				<view class="btn btn-query" v-if="btnState.isQuery" @click.stop="queryLogistics">查看物流</view>
 				<view class="btn btn-cancel" v-if="btnState.isPay" @click.stop="btnConfirmPay">立即支付</view>
@@ -62,7 +62,7 @@ export default {
 		cmInviceTemp,
 		cmPaymentTemp,
 		cmRefundTemp,
-		cmVoucherTemp,
+		cmVoucherTemp
 	},
 	data() {
 		return {
@@ -101,8 +101,11 @@ export default {
 	},
 	methods: {
 		async initOrderDetaileData() {
-			try{
-				const res = await this.OrderService.QueryOrderDetails({ shopOrderId: this.shopOrderId, userId: this.userId })
+			try {
+				const res = await this.OrderService.QueryOrderDetails({
+					shopOrderId: this.shopOrderId,
+					userId: this.userId
+				})
 				const data = res.data
 				this.skeletonShow = true
 				this.status = data.shopOrder.status
@@ -111,7 +114,7 @@ export default {
 				this.orderInvoice = data.orderInvoice
 				this.returnedPurchaseList = data.returnedPurchaseList
 				this.discernReceiptList = data.discernReceiptList
-				this.receiptAmount = data.order.receiptAmount
+				this.receiptAmount = data.shopOrder.receiptAmount
 				this.returnedPurchaseFee = data.shopOrder.returnedPurchaseFee
 				this.voucherList = data.voucher
 				this.mapStateArr.forEach(el => {
@@ -121,8 +124,7 @@ export default {
 						}
 					})
 				})
-				
-			}catch(error){
+			} catch (error) {
 				this.$util.msg(error.msg, 2000)
 			}
 		},
@@ -141,13 +143,13 @@ export default {
 		},
 		//监听根据付款状态做操作
 		async getOrderPaymentValidation() {
-			try{
+			try {
 				const res = await this.OrderService.OrderPaymentValidation({ shopOrderId: this.shopOrderId })
 				this.$api.navigateTo(`/pages/user/order/order-pay-list?shopOrderId=${res.data.shopOrderId}`)
-			}catch(error){
+			} catch (error) {
 				this.$util.msg(error.msg, 2000)
 			}
-		},
+		}
 	},
 	onShow() {}
 }

pages/user/order/order-sharelogin.vue

@@ -112,7 +112,7 @@ export default {
 				} else if (res.code === 3) {
 					// 游客第二次查看订单详情
 					this.$api.redirectTo(
-						`/pages/user/order/order-sharedetails?orderId=${this.params.shopOrderId}&userId=${
+						`/pages/user/order/order-sharedetails?shopOrderId=${this.params.shopOrderId}&userId=${
 							this.params.userId
 						}`
 					)
@@ -147,16 +147,16 @@ export default {
 			// 待支付订单
 			this.getOrderPaymentValidation(this.params.shopOrderId)
 		},
-		async getOrderPaymentValidation(orderId) {
+		async getOrderPaymentValidation(shopOrderId) {
 			//监听根据付款状态做操作
 			try{
-				const res = await this.OrderService.OrderPaymentValidation({ shopOrderId: orderId })
+				const res = await this.OrderService.OrderPaymentValidation({ shopOrderId: shopOrderId })
 				const data = res.data
 				if(data.code == -1){
 					this.modal = true
 					this.contentModalText ='订单已申请全部退款，无需再付款！'
 				}else{
-					this.$api.navigateTo(`/pages/user/order/order-pay-list?shopOrderId=${orderId}`)
+					this.$api.navigateTo(`/pages/user/order/order-pay-list?shopOrderId=${shopOrderId}`)
 				}
 			}catch(error){
 				this.$util.msg(error.msg, 2000)