commit -m 订单模块

components/cm-module/orderDetails/goodsList.vue

@@ -4,14 +4,8 @@
 		<view class="goods-list">
 			<view v-for="(item, index) in list" :key="index" 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="information.secondHandOrderFlag == 1"
 						>{{ item.shopName }}
-						<label class="paymenttext" v-if="information.affirmPaymentFlag == 1">已确认打款供应商</label>
 					</view>
 					<view class="title-text" v-else @click="goShophome(item)">
 						{{ item.shopName }} <label class="iconfont icon-jinrudianpu"></label>
@@ -22,7 +16,6 @@
 						<view class="pros-left">
 							<view class="pros-img">
 								<image :src="pros.image" alt="" />
-								<text class="tips" v-if="pros.giftType == 2 || pros.giftType == 1">赠品</text>
 							</view>
 						</view>
 						<view class="pros-product">
@@ -31,48 +24,12 @@
 								>规格：{{ pros.productUnit ? pros.productUnit : '' }}</view
 							>
 							<view class="product-view">
-								<view
-									class="view-num red"
-									:class="
-										pros.svipPriceFlag == 1 || PromotionsFormat(pros.productPromotion) ? 'none' : ''
-									"
-									>￥{{ pros.price | NumFormat }}</view
-								>
+								<view class="view-num red">￥{{ pros.price | NumFormat }}</view>
 								<view class="view-num right">x {{ pros.num }}</view>
 							</view>
-							<view class="floor-item-act">
-								<template v-if="pros.productPromotion">
-									<view
-										v-if="PromotionsFormat(pros.productPromotion)"
-										class="floor-tags"
-										@click.stop="clickPopupShow(pros.productPromotion)"
-									>
-										{{ pros.productPromotion.name }}
-										<text v-if="pros.productPromotion != null && pros.productPromotion.type != 3">
-											:￥{{
-												pros.productPromotion == null
-													? '0.00'
-													: pros.productPromotion.touchPrice | NumFormat
-											}}
-										</text>
-									</view>
-									<view
-										v-else-if="pros.productPromotion.type != 3"
-										class="floor-tags"
-										@click.stop="clickPopupShow(pros.productPromotion)"
-										>{{ pros.productPromotion.name }}</view
-									>
-								</template>
-								<template v-if="pros.svipPriceFlag == 1">
-									<view class="svip-tags">
-										<view class="tags">SVIP</view>
-										<view class="price">{{ pros.svipPriceTag }}</view>
-									</view>
-								</template>
-							</view>
 						</view>
 					</view>
-					<view class=" product-info clearfix"> 
+					<!-- <view class=" product-info clearfix"> 
 						<view class="product-view" v-if="pros.returnedNum > 0 || pros.actualCancelNum > 0">
 							<view class="view-num">已退货/已取消：<text class="text">{{ pros.returnedNum }}/{{ pros.actualCancelNum }}</text></view>
 						</view>
@@ -88,7 +45,7 @@
 						<view class="product-view allPrice">
 							<view class="view-num">合计：<text class="text">￥{{ pros.totalFee | NumFormat }}</text></view>
 						</view>
-					</view>
+					</view> -->
 				</view>
 				<view class="goods-pros-m" v-if="item.note">
 					<view class="m-text">留言:</view>
@@ -253,7 +210,7 @@ export default {
                     display: inline-block;
                     padding:0 6rpx;
                     font-size: $font-size-20;
-                    border: 1px solid #F3B574;
+                    border: 1px solid #FF5B00;
                     float: left;
                 }
             }
@@ -285,7 +242,6 @@ export default {
 			height: auto;
 			padding: 0;
 			box-sizing: border-box;
-			border-bottom: 1px solid #E1E1E1;
 		}
 		.goods-pros-t {
 			display: flex;

components/cm-module/orderDetails/orderButton.vue

@@ -2,8 +2,8 @@
 	<view class="button-template" :style="{paddingBottom :isIphoneX ? '68rpx' : '0rpx'}">
 		<!-- 底部按钮 -->
 		<view class="button-content">
-			<view class="btn btn-payment" v-if="order.affirmPaymentFlag == 10" @click.stop="btnConfirm('payment',order)">确认打款<text>供应商</text></view>
-			<view class="btn btn-confirm" v-if="btnState.isConfirmation" @click.stop="btnConfirm('confirmation',order)">确认订单</view>
+			<!-- <view class="btn btn-payment" v-if="order.affirmPaymentFlag == 10" @click.stop="btnConfirm('payment',order)">确认打款<text>供应商</text></view> -->
+			<!-- <view class="btn btn-confirm" v-if="btnState.isConfirmation" @click.stop="btnConfirm('confirmation',order)">确认订单</view> -->
 			<view class="btn btn-pay" v-if="btnState.isPay" @click.stop="btnConfirm('pay',order)">付款</view>
 			<view class="btn btn-share" @click.stop="onShareCode">
 				<view class="tips" v-if="shareCode">分享码：{{shareCode}}</view>
@@ -168,9 +168,9 @@
 				color: #FFFFFF;
 			}
 			.btn-pay{
-				background:#f94b4b;
+				background:$btn-confirm;
 				margin-right: 0;
-				border: 2rpx solid #f94b4b;
+				border: 2rpx solid $btn-confirm;
 				color: #fff;
 			}
 			.btn-firm{

components/cm-module/orderDetails/orderInformation.vue

@@ -33,12 +33,12 @@
 					</view>
 					<!-- <view class="view-type">{{ orderData.status | TextFormat }}</view> -->
 				</view>
-				<view class="information-view same">
+				<!-- <view class="information-view same">
 					<view class="view-num">
 						余额抵扣：<label class="label">￥{{ orderData.balancePayFee | NumFormat }}</label>
 					</view>
-				</view>
-				<view class="information-view ">
+				</view> -->
+				<view class="information-view same">
 					<view class="view-num" v-if="orderData.postageFlag == 0">
 						运费：<label class="label">包邮</label>
 					</view>
@@ -49,7 +49,7 @@
 						运费：<label class="label">￥{{ orderData.postage | NumFormat }}</label>
 					</view>
 				</view>
-				<view class="information-view same" v-if="orderData.svipFullReduction > 0">
+				<!-- <view class="information-view same" v-if="orderData.svipFullReduction > 0">
 					<view class="view-man">
 						超级会员优惠：<label class="label">￥{{ orderData.svipFullReduction | NumFormat }}</label>
 					</view>
@@ -83,13 +83,13 @@
 							orderData.presentCount + orderData.promotionalGiftsCount
 						}}</label>
 					</view>
-				</view>
-				<view class="information-view same">
+				</view> -->
+				<view class="information-view">
 					<view class="view-man">
 						应付总额：<label class="red">￥{{ orderData.payableAmount | NumFormat }}</label>
 					</view>
 				</view>
-				<view class="information-view">
+				<view class="information-view same">
 					<view class="view-num">
 						已支付：<label class="red">￥{{ orderData.receiptAmount | NumFormat }}</label>
 					</view>

components/cm-module/orderDetails/orderListButton.vue

@@ -2,9 +2,8 @@
 	<view class="button-template">
 		<!-- 底部按钮 -->
 		<view class="button-content">
-			<view class="btn btn-payment" v-if="order.affirmPaymentFlag == 10" @click.stop="btnConfirm('payment',order)">确认打款<text>供应商</text></view>
 			<view class="btn btn-pay" v-if="btnState.isPay" @click.stop="btnConfirm('pay',order)">付款</view>
-			<view class="btn btn-confirm" v-if="btnState.isConfirmation" @click.stop="btnConfirm('confirmation',order)">确认订单</view>
+			<!-- <view class="btn btn-confirm" v-if="btnState.isConfirmation" @click.stop="btnConfirm('confirmation',order)">确认订单</view> -->
 			<view class="btn btn-share"  @click.stop="onShareCode(order.orderId)">分享订单</view>
 			<view class="btn btn-cancel" v-if="btnState.isCancel" @click.stop="btnConfirm('cancel',order)">取消订单</view>
 			<!-- <view class="btn btn-delete" v-if="btnState.isDelete" @click.stop="btnConfirm('delete',order)">删除订单</view> -->
@@ -93,7 +92,7 @@
 			},
 			onShareCode(orderId){
 				this.$parent.isShareModal = true
-				this.$parent.btnoRderID = orderId
+				this.$parent.handleOrderId = orderId
 				this.$emit('shareConfirm')
 			},
 			btnConfirm(type,order){
@@ -176,9 +175,10 @@
 				color: #FFFFFF;
 			}
 			.btn-pay{
-				background:#f94b4b;
-				color: #FFFFFF;
-				border: 2rpx solid #f94b4b;
+				background:$btn-confirm;
+				margin-right: 0;
+				border: 2rpx solid $btn-confirm;
+				color: #fff;
 			}
 			.btn-firm{
 				position:relative;

components/cm-module/productDetails/cm-unit-popup.vue

@@ -8,49 +8,8 @@
 					<view class="tui-sku-price">
 						<view class="sku-price-viw">
 							<view
-								class="sku-price-text"
-								:class="
-									PromotionsFormat(skuProduct.promotions) || skuProduct.svipProductFlag == 1
-										? 'none'
-										: ''
-								"
-							>
-								￥{{
-									(PromotionsFormat(skuProduct.promotions) || skuProduct.svipProductFlag == 1
-										? skuProduct.originalPrice
-										: skuProduct.price) | NumFormat
-								}}
-							</view>
-						</view>
-						<view class="sku-price-vip">
-							<view class="floor-item-act">
-								<view class="coupon-tags" v-if="skuProduct.couponsLogo">优惠券</view>
-								<template v-if="skuProduct.actStatus == 1 && skuProduct.promotions">
-									<view v-if="PromotionsFormat(skuProduct.promotions)" class="floor-tags">
-										{{ skuProduct.promotions.name }}
-										<text v-if="skuProduct.promotions != null && skuProduct.promotions.type != 3">
-											:￥{{
-												skuProduct.promotions == null
-													? '0.00'
-													: skuProduct.promotions.touchPrice | NumFormat
-											}}
-										</text>
-									</view>
-									<view v-else-if="skuProduct.promotions.type != 3" class="floor-tags">
-										{{ skuProduct.promotions.name }}
-									</view>
-								</template>
-								<template v-if="skuProduct.actStatus == null && skuProduct.ladderFlag == 1">
-									<view class="floor-tags">阶梯价格</view>
-								</template>
-								<template v-if="skuProduct.svipProductFlag == 1">
-									<view class="svip-tags">
-										<view class="tags" :class="{ none: vipFlag != 1 }">SVIP</view>
-										<view class="price" v-if="isShowVipFlag(skuProduct)">{{
-											skuProduct.svipPriceTag
-										}}</view>
-									</view>
-								</template>
+								class="sku-price-text">
+								￥{{skuProduct.price | NumFormat}}
 							</view>
 						</view>
 					</view>

components/cm-module/productDetails/evaluate.vue

@@ -30,8 +30,6 @@
 
 <script>
 	import authorize from '@/common/config/authorize.js'
-	import tuiLoadmore from "@/components/tui-components/loadmore/loadmore"
-	import tuiNomore from "@/components/tui-components/nomore/nomore"
 	import uniStars from '@/components/uni-stars/uni-stars.vue'
 	
 	export default{
@@ -44,8 +42,6 @@
 			}
 		},
 		components:{
-			tuiLoadmore,
-			tuiNomore,
 			uniStars
 		},
 		data() {

components/cm-simple-swiper/cm-simple-swiper.vue

@@ -1,153 +0,0 @@
-<template>
-    <view class="simple-swiper">
-        <uni-swiper-dot :info="mapList" :current="current" :mode="mode" :dotsStyles="dotsStyles">
-            <swiper
-                class="swiper"
-                :style="{ height: swiperHeight + 'rpx' }"
-                :indicator-dots="indicatorDots"
-                :indicator-color="indicatorColor"
-                :indicator-active-color="indicatorActiveColor"
-                :autoplay="autoplay"
-                :current="current"
-                :interval="interval"
-                :duration="duration"
-                :circular="circular"
-                :vertical="vertical"
-                :previousMargin="previousMargin"
-                :nextMargin="nextMargin"
-                :skipHiddenItemLayout="skipHiddenItemLayout"
-                :easingFunction="easingFunction"
-                @change="onChange"
-                @transition="onTransition"
-                @animationfinish="onAnimationfinish"
-            >
-                <swiper-item v-for="(item, index1) in mapList" :key="index1">
-                    <view class="swiper__item" :style="layoutStyle">
-                        <template v-if="item.length">
-                            <view v-for="(data, index2) in item" class="grid" :key="index2">
-                                <slot :row="data" name="slide"></slot>
-                            </view>
-                        </template>
-                        <view v-else class="grid"><slot name="slide" :row="item"></slot></view>
-                    </view>
-                </swiper-item>
-            </swiper>
-        </uni-swiper-dot>
-    </view>
-</template>
-
-<script>
-import swiperProps from './mixins/swiper'
-export default {
-    name: 'cm-simple-swiper',
-    mixins: [swiperProps],
-    props: {
-        /* swiper数据 */
-        data: {
-            type: Array,
-            default: () => []
-        },
-        // 行数
-        rows: {
-            type: Number,
-            default: 1
-        },
-        // 列数
-        columns: {
-            type: Number,
-            default: 1
-        },
-        swiperHeight: {
-            type: Number,
-            default: 350
-        },
-        gapX: {
-            type: Number,
-            default: 0
-        },
-        gapY: {
-            type: Number,
-            default: 0
-        },
-        padding: {
-            type: String,
-            default: '0'
-        },
-        autoFill: {
-            type: Boolean,
-            default: false
-        }
-    },
-    computed: {
-        // 真正渲染的列表
-        mapList() {
-            const result = this.formatSwiperList(this.data)
-            return result
-        },
-        // 宽
-        width() {
-            return 100 / this.columns + '%'
-        },
-		mode(){
-			return 'round'
-		},
-        dotsStyles() {
-            return {
-                width: 4,
-                bottom: 0,
-                color: 'background: rgba(255, 255, 255, 0.39)',
-                backgroundColor: 'background: rgba(255, 255, 255, 0.39)',
-                border: '0',
-                selectedBackgroundColor: '#FF457B',
-                selectedBorder: '#FF457B'
-            }
-        },
-        layoutStyle() {
-            return `
-                display: grid;
-                padding: ${this.padding};
-                grid-template-columns: repeat(${this.columns}, 1fr);
-                grid-template-rows: repeat(${this.rows}, 1fr);
-                grid-column-gap: ${this.gapX}rpx;
-                grid-row-gap: ${this.gapX}rpx;
-            `
-        }
-    },
-    methods: {
-        // 处理轮播图数据列表
-        formatSwiperList(list = []) {
-            const result = []
-            const count = this.rows * this.columns
-            // 一屏仅有一个时
-            if (count === 1) {
-                return list
-            }
-            let start = 0
-            // 一屏多个时
-            while (list.length > 0) {
-                if (start >= list.length) {
-                    break
-                }
-                const slice = list.slice(start, start + count)
-                if (slice.length < count && this.autoFill) {
-                    slice.push(...this.fullArray(count - slice.length))
-                }
-                result.push(slice)
-                start += count
-            }
-            return result
-        },
-        // 补全
-        fullArray(count) {
-            return this.data.slice(0, count)
-        }
-    }
-}
-</script>
-
-<style lang="scss" scoped>
-.grid {
-    display: flex;
-    justify-content: center;
-}
-</style>

components/cm-simple-swiper/mixins/swiper.js

@@ -1,70 +0,0 @@
-/* uniapp-swiper混入对象 */
-export default {
-    props: {
-        indicatorDots: {
-            type: Boolean,
-            default: false
-        },
-        indicatorColor: {
-            type: String,
-            default: 'rgba(0, 0, 0, .3)'
-        },
-        indicatorActiveColor: {
-            type: String,
-            default: '#000000'
-        },
-        autoplay: {
-            type: Boolean,
-            default: true
-        },
-        current: {
-            type: Number,
-            default: 0
-        },
-        interval: {
-            type: Number,
-            default: 5000
-        },
-        duration: {
-            type: Number,
-            default: 500
-        },
-        circular: {
-            type: Boolean,
-            default: false
-        },
-        vertical: {
-            type: Boolean,
-            default: false
-        },
-        previousMargin: {
-            type: String,
-            default: '0px'
-        },
-        nextMargin: {
-            type: String,
-            default: '0px'
-        },
-        skipHiddenItemLayout: {
-            type: Boolean,
-            default: false
-        },
-        easingFunction: {
-            type: String,
-            default: 'default',
-            validator: value => ['default', 'linear', 'easeInCubic', 'easeOutCubic', 'easeInOutCubic'].indexOf(value
-                .toString()) > -1
-        }
-    },
-    methods:{
-        onChange(event) {
-            this.$emit('change', event.detail)
-        },
-        onTransition(event) {
-            this.$emit('transition', event.detail)
-        },
-        onAnimationfinish(event) {
-            this.$emit('animationfinish', event.detail)
-        }
-    }
-}

components/thorui/tui-skeleton/tui-skeleton.vue

@@ -185,7 +185,7 @@
 	}
 
 	.tui-loading-5 {
-		border-color: #e5e5e5 #e5e5e5 #e5e5e5 #fc872d;
+		border-color: #e5e5e5 #e5e5e5 #e5e5e5 #F3B574;
 	}
 
 	.tui-loading-6 {

components/tui-components/loadmore/loadmore.vue

@@ -1,166 +0,0 @@
-<template>
-	<view class="tui-loadmore" v-if="visible">
-		<view :class="['tui-loading-'+index, (index==3 && type)?'tui-loading-'+type:'']"></view>
-		<view class="tui-loadmore-tips">{{text}}</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		name: "tuiLoadmore",
-		props: {
-			//显示文本
-			text: {
-				type: String,
-				default: "正在加载..."
-			},
-			//是否可见
-			visible: {
-				type: Boolean,
-				default: false
-			},
-			//loading 样式 ：1,2,3
-			index: {
-				type: Number,
-				default: 1
-			},
-			//颜色设置，只有index=3时生效：primary，red，orange，green
-			type: {
-				type: String,
-				default: ""
-			}
-		}
-	}
-</script>
-
-<style>
-	.tui-loadmore {
-		width: 48%;
-		margin: 1.5em auto;
-		line-height: 1.5em;
-		font-size: 24upx;
-		text-align: center;
-	}
-
-	.tui-loading-1 {
-		margin: 0 5px;
-		width: 20px;
-		height: 20px;
-		display: inline-block;
-		vertical-align: middle;
-		-webkit-animation: a 1s steps(12) infinite;
-		animation: a 1s steps(12) infinite;
-		background: transparent url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMjAiIGhlaWdodD0iMTIwIiB2aWV3Qm94PSIwIDAgMTAwIDEwMCI+PHBhdGggZmlsbD0ibm9uZSIgZD0iTTAgMGgxMDB2MTAwSDB6Ii8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjRTlFOUU5IiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDAgLTMwKSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iIzk4OTY5NyIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSgzMCAxMDUuOTggNjUpIi8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjOUI5OTlBIiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0icm90YXRlKDYwIDc1Ljk4IDY1KSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iI0EzQTFBMiIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSg5MCA2NSA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNBQkE5QUEiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoMTIwIDU4LjY2IDY1KSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iI0IyQjJCMiIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSgxNTAgNTQuMDIgNjUpIi8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjQkFCOEI5IiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0icm90YXRlKDE4MCA1MCA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNDMkMwQzEiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoLTE1MCA0NS45OCA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNDQkNCQ0IiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoLTEyMCA0MS4zNCA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNEMkQyRDIiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoLTkwIDM1IDY1KSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iI0RBREFEQSIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSgtNjAgMjQuMDIgNjUpIi8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjRTJFMkUyIiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0icm90YXRlKC0zMCAtNS45OCA2NSkiLz48L3N2Zz4=) no-repeat;
-		background-size: 100%;
-	}
-
-	@-webkit-keyframes a {
-		0% {
-			-webkit-transform: rotate(0deg);
-			transform: rotate(0deg);
-		}
-
-		to {
-			-webkit-transform: rotate(1turn);
-			transform: rotate(1turn);
-		}
-	}
-
-	@keyframes a {
-		0% {
-			-webkit-transform: rotate(0deg);
-			transform: rotate(0deg);
-		}
-
-		to {
-			-webkit-transform: rotate(1turn);
-			transform: rotate(1turn);
-		}
-	}
-
-	.tui-loadmore-tips {
-		display: inline-block;
-		vertical-align: middle;
-	}
-
-	.tui-loading-2 {
-		width: 28upx;
-		height: 28upx;
-		border: 1px solid #8f8d8e;
-		border-radius: 50%;
-		margin: 0 6px;
-		display: inline-block;
-		vertical-align: middle;
-		clip-path: polygon(0% 0%,100% 0%,100% 30%,0% 30%);
-		animation: rotate 1s linear infinite;
-	}
-
-	@-webkit-keyframes rotate {
-		from {
-			transform: rotatez(0deg);
-		}
-
-		to {
-			transform: rotatez(360deg);
-		}
-	}
-
-	@keyframes rotate {
-		from {
-			transform: rotatez(0deg);
-		}
-
-		to {
-			transform: rotatez(360deg);
-		}
-	}
-
-	.tui-loading-3 {
-		display: inline-block;
-		margin: 0 6px;
-		vertical-align: middle;
-		width: 28upx;
-		height: 28upx;
-		background: 0 0;
-		border-radius: 50%;
-		border: 2px solid;
-		border-color: #e5e5e5 #e5e5e5 #e5e5e5 #8f8d8e;
-		animation: tui-rotate 0.7s linear infinite;
-	}
-
-	.tui-loading-3.tui-loading-primary {
-		border-color: #e5e5e5 #e5e5e5 #e5e5e5 #5677fc;
-	}
-
-	.tui-loading-3.tui-loading-green {
-		border-color: #e5e5e5 #e5e5e5 #e5e5e5 #19be6b;
-	}
-
-	.tui-loading-3.tui-loading-orange {
-		border-color: #e5e5e5 #e5e5e5 #e5e5e5 #ff7900;
-	}
-
-	.tui-loading-3.tui-loading-red {
-		border-color: #ededed #ededed #ededed #ed3f14;
-	}
-
-	@-webkit-keyframes tui-rotate {
-		0% {
-			transform: rotate(0);
-		}
-
-		100% {
-			transform: rotate(360deg);
-		}
-	}
-
-	@keyframes tui-rotate {
-		0% {
-			transform: rotate(0);
-		}
-
-		100% {
-			transform: rotate(360deg);
-		}
-	}
-</style>

components/tui-components/nomore/nomore.vue

@@ -1,119 +0,0 @@
-<template>
-	<view class="tui-nomore-class tui-loadmore-none" v-if="visible">
-		<view :class="[isDot?'tui-nomore-dot':'tui-nomore']">
-			<view :style="{background:bgcolor}" :class="[isDot?'tui-dot-text':'tui-nomore-text']">{{isDot?dotText:text}}</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		name: "tuiNomore",
-		props: {
-			//是否可见
-			visible: {
-				type: Boolean,
-				default: false
-			},
-			//当前页面背景颜色
-			bgcolor: {
-				type: String,
-				default: "#FFFFFF"
-			},
-			//是否以圆点代替 "没有更多了"
-			isDot: {
-				type: Boolean,
-				default: false
-			},
-			//isDot为false时生效
-			text: {
-				type: String,
-				default: "已至底部"
-			}
-		},
-		data() {
-			return {
-				dotText: "●"
-			};
-		}
-	}
-</script>
-
-<style>
-	.tui-loadmore-none {
-		width: 50%;
-		margin: 1em auto;
-		line-height: 1.5em;
-		font-size: 24rpx;
-		display: flex;
-		justify-content: center;
-	}
-
-	.tui-nomore {
-		width: 100%;
-		height: 100%;
-		position: relative;
-		display: flex;
-		justify-content: center;
-		margin-top: 10rpx;
-		padding-bottom: 6rpx;
-	}
-
-	.tui-nomore::before {
-		content: ' ';
-		position: absolute;
-		border-bottom: 1rpx solid #e5e5e5;
-		-webkit-transform: scaleY(0.5);
-		transform: scaleY(0.5);
-		width: 100%;
-		top: 18rpx;
-		left: 0;
-	}
-
-	.tui-nomore-text {
-		color: #999;
-		font-size: 24rpx;
-		text-align: center;
-		padding: 0 18rpx;
-		height: 36rpx;
-		line-height: 36rpx;
-		position: relative;
-		z-index: 1;
-	}
-
-	.tui-nomore-dot {
-		position: relative;
-		text-align: center;
-		-webkit-display: flex;
-		display: flex;
-		-webkit-justify-content: center;
-		justify-content: center;
-		margin-top: 10rpx;
-		padding-bottom: 6rpx;
-	}
-
-	.tui-nomore-dot::before {
-		content: '';
-		position: absolute;
-		border-bottom: 1rpx solid #e5e5e5;
-		-webkit-transform: scaleY(0.5);
-		transform: scaleY(0.5);
-		width: 360rpx;
-		top: 18rpx;
-	}
-
-	.tui-dot-text {
-		position: relative;
-		color: #e5e5e5;
-		font-size: 10px;
-		text-align: center;
-		width: 50rpx;
-		height: 36rpx;
-		line-height: 36rpx;
-		-webkit-transform: scale(0.8);
-		transform: scale(0.8);
-		-webkit-transform-origin: center center;
-		transform-origin: center center;
-		z-index: 1;
-	}
-</style>

pages.json

@@ -145,13 +145,6 @@
 						"navigationBarTitleText": "支付订单"
 					}
 				},
-				{
-					"path": "order/order-payhlb",
-					"style": {
-						"navigationBarTitleText": "收银台",
-						"navigationStyle": "custom"
-					}
-				},
 				{
 					"path": "order/orderShareLogin",
 					"style": {

pages/search/search-order.vue

@@ -221,8 +221,6 @@
 
 <script>
 import orSearch from '@/components/uni-search/or-search.vue'
-import tuiLoadmore from '@/components/tui-components/loadmore/loadmore'
-import tuiNomore from '@/components/tui-components/nomore/nomore'
 import orderButton from '@/components/cm-module/orderDetails/orderListButton' //按钮
 import modalLayer from '@/components/modal-layer'
 import empty from './components/empty'
@@ -237,8 +235,6 @@ const defaultListQuery = {
 export default {
 	components: {
 		orSearch,
-		tuiLoadmore,
-		tuiNomore,
 		orderButton,
 		empty,
 		shareAlert,

pages/tabBar/home/index.js

@@ -49,69 +49,15 @@ const homeMiXins = {
         			this.getHomeInformation()
         		})
         },
-        GetHomeTopDataInfo() {
-        	//直播、活动、文章模块
-        	this.CommonService.GetHomeTopDataInfo({ source: 2 })
-        		.then(response => {
-        			this.templateData = response.data
-        			this.isLiveRequest = true
-        		})
-        		.catch(error => {
-        			this.$util.msg(error.msg, 2000)
-        		})
-        },
-        GetHomeFloorInfo() {
-        	//初始化首页楼层数据
-        	this.CommonService.GetHomeDataInfo({ userId: this.userID, source: 2 })
-        		.then(response => {
-        			let data = response.data
-        			this.pageList = data.homePageFloor
-        			this.hotListPageFloor = data.pageFloorList
-        			this.supplierObj = data.supplierImage
-        			setTimeout(() => {
-        				this.isRequest = true
-        			}, 500)
-        		})
-        		.catch(error => {
-        			this.$util.msg(error.msg, 2000)
-        		})
-        },
-        GetInitBeansInfo() {
-        	//初始化采美豆信息
-        	this.UserService.GetHomeObtainBeans({ userId: this.userID })
-        		.then(response => {
-        			this.beansType = response.data.beansType
-        			this.beanNumber = response.data.num
-        			this.isActivityBean = true
-        		})
-        		.catch(error => {
-        			console.log('用户暂无采美豆推送~')
-        		})
-        },
-        getHomeInformation() {
+        mallOrganizeHome() {
         	//初始化首页数据
-        	this.CommonService.GetHomeModulesDataInfo({ source: 2 })
+        	this.CommonService.mallOrganizeHome({ organizeId: 1 })
         		.then(res => {
         			let data = res.data
-        			this.bannerImageList = data.bannerList
-        			this.mallPageModules = data.mallPageModules
-        			this.skeletonShow = false
-        			this.navBarsList = data.topMenuList
-        			this.couponEntry = data.couponEntry
-        			this.newsList = data.annlist
-        			if (!this.hasLogin && this.couponEntry == 1) {
-        				if (uni.getStorageSync('isActivitySwitch')) {
-        					this.$store.commit('setActivity', false)
-        				} else {
-        					this.$store.commit('setActivity', true)
-        				}
-        			}
-        			this.GetHomeTopDataInfo()
-        			this.GetHomeFloorInfo()
         			if (this.hasLogin) {
-        				this.initShoppingCartCount()
+        				// this.initShoppingCartCount()
         			}
-        			this.isNavRequest = true
+        			this.skeletonShow = false
         		})
         		.catch(error => {
         			this.$util.msg(error.msg, 2000)
@@ -122,29 +68,6 @@ const homeMiXins = {
         	this.OrderService.ShoppingCartCount({ userId: this.userID }).then(res => {
         		this.$store.commit('updateAllNum', res.data)
         	})
-        },
-        handleClick(data) {
-        	const pageId = 306
-        	this.$api.navigateTo('/pages/user/coupon/coupon-collection')
-        	this.$store.commit('setActivity', data)
-        	uni.setStorageSync('lockTime', Date.now())
-        	uni.setStorageSync('isActivitySwitch', true)
-        	// 友盟自定义事件
-        	// if(process.env.NODE_ENV != 'development'){
-        	// 	this.$uma.trackEvent('meibohui_click', {
-        	// 		Um_Key_PageName: '美博会',
-        	// 		Um_Key_PageCategory: '活动专题页面',
-        	// 		Um_Key_SourcePage: '首页',
-        	// 	})
-        	// }
-        },
-        handleCancelClick(data) {
-        	this.$store.commit('setActivity', data)
-        	uni.setStorageSync('lockTime', Date.now())
-        	uni.setStorageSync('isActivitySwitch', true)
-        },
-        handleBeanlClick() {
-        	this.isActivityBean = false
         }
     }
 }

pages/tabBar/home/index.vue

@@ -2,7 +2,7 @@
 	<view class="container home clearfix">
 		<!-- 主页内容 -->
 		<tui-skeleton
-			v-if="skeletonShow"
+			v-if="!skeletonShow"
 			backgroundColor="#fafafa"
 			borderRadius="10rpx"
 			:isLoading="true"
@@ -10,13 +10,13 @@
 		></tui-skeleton>
 		<view class="container-home tui-skeleton">
 			<!-- 轮播 -->
-			<banner :list="bannerImageList" v-if="isNavRequest"></banner>
+			<banner :list="bannerImageList" v-if="skeletonShow"></banner>
 			<!-- 金刚区菜单 -->
-			<navbars :list="navBarsList" v-if="isNavRequest"></navbars>
+			<navbars :list="banners" v-if="skeletonShow"></navbars>
 			<!-- 活动模块 -->
-			<hotmode :list="navBarsList" v-if="isNavRequest"></hotmode>
+			<hotmode :list="navBars" v-if="skeletonShow"></hotmode>
 			<!-- 楼层模块 -->
-			<floors :list="navBarsList" v-if="isNavRequest"></floors>
+			<floors :list="flootData" v-if="skeletonShow"></floors>
 		</view>
 	</view>
 </template>
@@ -48,31 +48,17 @@ export default {
 				textColor: '#FFFFFF'
 			},
 			CustomBar: this.CustomBar, // 顶部导航栏高度
-			userID: 0,
+			skeletonShow: false,
 			clubId: 0,
 			clubStatus: '',
 			current: 0,
 			mode: 'round',
 			isLogin: false,
-			skeletonShow: true,
 			userIdentity: 0,
+			banners: [], // 轮播
+			navBars: [], // 导航分类
 			flootData: [], // 楼层
-			bannerImageList: [], // 轮播
-			navBarsList: [], // 导航分类
-			newsList: [], // 公告
-			templateData: {},
-			hotListPageFloor: [], // 新品橱窗
-			pageList: [], // 楼层
-			supplierObj: {}, // 供应商列表
 			isScrollTop: false,
-			isRequest: false,
-			isNavRequest: false,
-			isLiveRequest: false,
-			isActivityBean: false,
-			beansType: 1,
-			beanNumber: 50,
-			couponEntry: 2,
-			autoplay: true
 		}
 	},
 	onLoad() {},
@@ -106,11 +92,10 @@ export default {
 		}
 	},
 	onShow() {
-		this.autoplay = true
-		this.GetWxAuthorize()
+		// this.GetWxAuthorize()
+		this.mallOrganizeHome()
 	},
 	onHide() {
-		this.autoplay = false
 	}
 }
 </script>

pages/user/collection/collection.vue

@@ -114,8 +114,6 @@
 	</view>
 </template>
 <script>
-import tuiLoadmore from '@/components/tui-components/loadmore/loadmore'
-import tuiNomore from '@/components/tui-components/nomore/nomore'
 import cmDrag from '@/components/cm-custom/cm-drag.vue'
 import cmUnitPopup from '@/components/cm-module/productDetails/cm-unit-popup.vue'
 
@@ -127,8 +125,6 @@ const defaultListQuery = {
 }
 export default {
 	components: {
-		tuiLoadmore,
-		tuiNomore,
 		cmDrag,
 		cmUnitPopup
 	},

pages/user/order/order-details.vue

@@ -7,70 +7,45 @@
 			:headerBtnPosi="headerBtnPosi"
 			:isShare="isOrderShare"
 		></header-back>
-		<view class="container-details" :style="{ paddingTop: navbarHeight + 'px' }">
-			<view class="status-text">
-				<view class="view-type">{{ information.status | TextFormat }}</view>
-				<text class="bage-buss" v-if="information.orderSubmitType == 3 || information.orderSubmitType == 4"
-					>协销</text
-				>
-				<text
-					class="bage-auto"
-					v-if="
-						information.orderSubmitType == 0 ||
-							information.orderSubmitType == 1 ||
-							information.orderSubmitType == 2
-					"
-					>自主</text
-				>
-			</view>
+		<tui-skeleton
+			v-if="!skeletonShow"
+			backgroundColor="#fafafa"
+			borderRadius="10rpx"
+			:isLoading="true"
+			:loadingType="5"
+		></tui-skeleton>
+		<view v-else class="container-details" :style="{ paddingTop: navbarHeight + 'px' }">
 			<!-- 地址选择 -->
-			<order-address
-				ref="orderAddress"
-				v-if="isRequest && !rechargeGoods"
-				:addressData="addressData"
-			></order-address>
-            <!-- 特殊商品退货须知 -->
-            <view class="return-instructions" v-if="returnGoodsStutas" v-html="helpContent"></view>
+			<order-address ref="orderAddress" v-if="skeletonShow" :addressData="addressData"></order-address>
 			<!-- 商品 -->
 			<goods-list
 				ref="goods"
-				v-if="isRequest"
+				v-if="skeletonShow"
 				:shopOrderData="shopOrderData"
 				:information="information"
-				@popupClick="hanldePopupFn"
 			></goods-list>
 			<!-- 订单信息 -->
-			<order-information ref="information" v-if="isRequest" :information="information"></order-information>
+			<order-information ref="information" v-if="skeletonShow" :information="information"></order-information>
 			<!-- 发票信息 -->
-			<invoice-tent ref="invoice" v-if="isRequest" :orderInvoice="orderInvoice"></invoice-tent>
+			<invoice-tent ref="invoice" v-if="skeletonShow" :orderInvoice="orderInvoice"></invoice-tent>
 			<!-- 支付记录 -->
 			<payment-record
 				ref="payment"
-				v-if="isRequest"
+				v-if="skeletonShow"
 				:discernReceiptList="discernReceiptList"
 				:receiptAmount="receiptAmount"
 			></payment-record>
 			<!-- 退款记录 -->
 			<refund-record
 				ref="refund"
-				v-if="isRequest"
+				v-if="skeletonShow"
 				:returnedPurchaseList="returnedPurchaseList"
 				:returnedPurchaseFee="returnedPurchaseFee"
 			></refund-record>
-			<view
-				class="clause"
-				v-if="information.secondHandOrderFlag != 1 && !orderSubmitType"
-				@tap.stop="openclauseConten(clauseData.id)"
-				:class="clauseData.name == '无条款' ? 'noclick' : ''"
-			>
-				售后条款：<label class="text" :class="clauseData.name == '无条款' ? 'color-bg' : ''">{{
-					clauseData.name
-				}}</label>
-			</view>
 			<!-- 底部button -->
 			<order-button
 				ref="orderButton"
-				v-if="isRequest"
+				v-if="skeletonShow"
 				:status="btnStatus"
 				:shareCode="shareCode"
 				:order="orderInfo"
@@ -78,26 +53,8 @@
 			>
 			</order-button>
 		</view>
-		<!-- 付款弹窗 -->
-		<order-model
-			v-if="isPayModel"
-			:payModelData="payModelData"
-			:modelType="modelType"
-			@cancelConfirm="hanldCancelConfirm"
-			@paymentConfirm="hanldPaymentConfirm"
-		/>
 		<!-- 分享弹窗 -->
 		<share-alert :orderId="orderId" v-if="isShareModal" @btnConfirm="onShareAppMessage"> </share-alert>
-		<!-- 促销活动弹窗 -->
-		<activi-popup :Promotion="handlerPros" :popupShow="popupShow"></activi-popup>
-		<!-- 采美豆提示弹窗 -->
-		<activityBean
-			v-if="isActivityBean"
-			:show="isActivityBean"
-			:beansType="beansType"
-			:beanNumber="beanNumber"
-			@cancel="handleBeanlClick"
-		></activityBean>
 		<!-- 提示弹窗 -->
 		<tui-modal
 			:show="modal"
@@ -123,9 +80,6 @@ import paymentRecord from '@/components/cm-module/orderDetails/paymentRecord' //
 import refundRecord from '@/components/cm-module/orderDetails/refundRecord' //退款记录
 import orderButton from '@/components/cm-module/orderDetails/orderButton' //底部按钮
 import shareAlert from '@/components/cm-module/modelAlert/shareAlert.vue' //分享弹窗
-import orderModel from '@/components/cm-module/modelAlert/order-alert' //付款弹窗
-import activiPopup from '@/components/cm-module/orderDetails/activipopu' //促销活动弹窗
-import activityBean from '@/components/cm-module/activity/activityBean.vue'
 
 export default {
 	components: {
@@ -137,13 +91,21 @@ export default {
 		paymentRecord,
 		refundRecord,
 		orderButton,
-		shareAlert,
-		orderModel,
-		activiPopup,
-		activityBean
+		shareAlert
 	},
 	data() {
 		return {
+			skeletonShow:false,
+			headerBtnPosi: this.setHeaderBtnPosi(), //获取设备顶部胶囊高度
+			systeminfo: this.setSysteminfo(), //获取设备信息
+			isIphoneX: this.$store.state.isIphoneX,
+			CustomBar: this.CustomBar, // 顶部导航栏高度
+			navbarHeight: '',
+			nvabarData: {
+				//顶部自定义导航
+				showCapsule: 1, // 是否显示左上角图标   1表示显示    0表示不显示
+				title: '订单详情' // 导航栏 中间的标题
+			},
 			state: 0,
 			userId: '',
 			orderId: '',
@@ -153,14 +115,11 @@ export default {
 			payStatus: 0,
 			btnStatus: 0, //按钮组件状态
 			onlinePayFlag: '',
-			isRequest: false, //是否加载完成渲染子组件
 			isOrderShare: false,
 			isShareModal: false,
-			isPayModel: false,
 			modelType: 0,
 			orderInfo: {},
 			alertOrderInfo: {},
-			payModelData: {},
 			addressData: {}, //地址信息初始化
 			information: {}, //订单信息初始化
 			shopOrderData: {}, //商品信息初始化
@@ -169,27 +128,15 @@ export default {
 			discernReceiptList: {}, //支付信息初始化
 			receiptAmount: 0, //支付金额
 			returnedPurchaseFee: 0, //退款金额
-			rechargeGoods: false,
-			navbarHeight: '',
-			headerBtnPosi: this.setHeaderBtnPosi(), //获取设备顶部胶囊高度
-			systeminfo: this.setSysteminfo(), //获取设备信息
-			isIphoneX: this.$store.state.isIphoneX,
-			CustomBar: this.CustomBar, // 顶部导航栏高度
-			popupShow: false,
-			handlerPros: {},
-			nvabarData: {
-				//顶部自定义导航
-				showCapsule: 1, // 是否显示左上角图标   1表示显示    0表示不显示
-				title: '订单详情' // 导航栏 中间的标题
-			},
-			clauseData: {},
-			orderSubmitType: false, //自主订单
-			beansType: 1,
-			beanNumber: 0,
-			isActivityBean: false,
-			modal:false,
+			handleModelEven: 0,
+			modal: false,
 			contentModalText: '订单查询失败,请稍候重试~', //操作文字提示语句
 			modalButton: [
+				{
+					text: '取消',
+					type: 'gray',
+					plain: true //是否空心
+				},
 				{
 					text: '确定',
 					customStyle: {
@@ -198,9 +145,7 @@ export default {
 					},
 					plain: false
 				}
-			],
-            returnGoodsStutas: false,
-            helpContent: '',
+			]
 		}
 	},
 	onLoad(option) {
@@ -249,53 +194,32 @@ export default {
 		}
 	},
 	methods: {
-		openclauseConten(id) {
-			this.$api.navigateTo(`/pages/service/sellconten?clauseId=${id}`)
-		},
+		// 获取订单详情
 		async initOrderDetaileData() {
-			const userInfo = await this.$api.getStorage()
-			this.userId = userInfo.userId ? userInfo.userId : 0
-			//初始化页面数据@参数：订单ID
-			this.OrderService.QueryOrderDetails({ orderId: this.orderId, userId: this.userId })
-				.then(response => {
-					let data = response.data
-					this.isRequest = true
-					this.orderInfo = data.order
-					this.shareCode = data.shareCode
-					this.addressData = data.userInfo
-					this.information = data.order
-					this.rechargeGoods = data.order.rechargeGoods
-					this.btnStatus = data.order.status
-					this.payStatus = data.order.payStatus
-					this.payableAmount = data.order.payableAmount
-					this.shopOrderData = data.shopOrderList
-					this.orderInvoice = data.orderInvoice
-					this.onlinePayFlag = data.order.onlinePayFlag
-					this.returnedPurchaseList = data.returnedPurchaseList
-					this.discernReceiptList = data.discernReceiptList
-					this.receiptAmount = data.order.receiptAmount
-					this.returnedPurchaseFee = data.order.returnedPurchaseFee
-					this.clauseData = data.clause
-                    // 特殊商品退货须知
-                    this.returnGoodsStutas = data.returnGoodsStutas && data.returnGoodsStutas === 2 // 1:可以 2:不可以
-                    this.helpContent = data.helpContent
-					if (
-						this.information.orderSubmitType == 0 ||
-						this.information.orderSubmitType == 1 ||
-						this.information.orderSubmitType == 2
-					) {
-						this.orderSubmitType = true
-					} else {
-						this.orderSubmitType = false
-					}
-				})
-				.catch(error => {
-					this.modal = true
-				})
-		},
-		handleClick(){
-			this.modal = false
-			this.$api.switchTabTo('/pages/tabBar/home/index')
+			try {
+				const userInfo = await this.$api.getStorage()
+				this.userId = userInfo.userId ? userInfo.userId : 0
+				const res = await this.OrderService.QueryOrderDetails({ orderId: this.orderId, userId: this.userId })
+				const data = res.data
+				this.skeletonShow = true
+				this.orderInfo = data.order
+				this.shareCode = data.shareCode
+				this.addressData = data.userInfo
+				this.information = data.order
+				this.btnStatus = data.order.status
+				this.payStatus = data.order.payStatus
+				this.payableAmount = data.order.payableAmount
+				this.shopOrderData = data.shopOrderList
+				this.orderInvoice = data.orderInvoice
+				this.onlinePayFlag = data.order.onlinePayFlag
+				this.returnedPurchaseList = data.returnedPurchaseList
+				this.discernReceiptList = data.discernReceiptList
+				this.receiptAmount = data.order.receiptAmount
+				this.returnedPurchaseFee = data.order.returnedPurchaseFee
+			} catch (error) {
+				//TODO handle the exception
+				this.$util.msg(error.msg, 2000)
+			}
 		},
 		handButtonConfirm(data) {
 			//监听点击时间的按钮类型并执行...
@@ -304,171 +228,79 @@ export default {
 		handShowAlert(data) {
 			//判断点击的按钮类型并执行...
 			switch (data.type) {
-				case 'delete':
-					this.handOrderDetele()
-					break
 				case 'cancel':
-					this.handCenceConfirm()
+					//取消订单
+					this.modal = true
+					this.contentModalText = '确认取消该订单吗？'
+					this.handleModelEven = 1
 					break
 				case 'query':
 					this.$api.navigateTo('/pages/user/order/order-logistics?orderId=' + this.orderId)
 					break
 				case 'confirm':
-					this.handOrderConfirm()
+					//确认收货
+					this.modal = true
+					this.contentModalText = '确认收货吗？'
+					this.handleModelEven = 2
 					break
 				case 'pay':
 					this.getOrderPaymentValidation(data)
 					break
-				case 'confirmation':
-					this.handOrderConfirmation()
-					break
-				case 'payment':
-					this.hanldConfirmFn(data.orderId)
-					break
 			}
 		},
 		getOrderPaymentValidation(data) {
 			//监听根据付款状态做操作
-			this.OrderService.OrderPaymentValidation({ orderId: data.orderId }).then(response => {
-				let data = response.data
-				this.payModelData = data
-				if(data.balanceFlag == 1){// 0可以走余额抵扣，1不能走余额抵扣
-					this.$api.navigateTo(`/pages/user/order/order-pay-list?orderId=${data.orderId}`)
-				}else{
-					switch (data.code) {
-						case 1:
-							this.isPayModel = true
-							this.modelType = 1
-							break
-						case 2:
-							this.isPayModel = true
-							this.modelType = 2
-							break
-						case -1:
-							this.$util.modal('', '订单已申请全部退款，无需再付款！', '确定', '', false, () => {})
-							break
-						default:
-							if (data.onlinePayFlag == 1) {// 只能线下
-								this.$api.navigateTo(`/pages/user/pay/card-under?orderId=${data.orderId}`)
-							} else {
-								this.$api.navigateTo(`/pages/user/order/order-pay-list?orderId=${data.orderId}`)
-							}
-					}
-				}
-			})
-			.catch(error => {
-				this.$util.msg(error.msg, 2000)
-			})
-		},
-		hanldPaymentConfirm(data) {
-			//余额抵扣跳转
-			this.OrderService.OrderBalanceDeduction({ orderId: data.order.orderId })
+			this.OrderService.OrderPaymentValidation({ orderId: data.orderId })
 				.then(response => {
-					if (data.type === 2) {
-						let _data = { orderId: data.order.orderId }
-						this.$api.navigateTo(
-							`/pages/user/order/success?type=deduction&data=${JSON.stringify({ data: _data })}`
-						)
+					let data = response.data
+					if (data.onlinePayFlag == 1) {
+						// 只能线下
+						this.$api.navigateTo(`/pages/user/pay/card-under?orderId=${data.orderId}`)
 					} else {
-						this.$api.navigateTo(`/pages/user/pay/card-under?orderId=${data.order.orderId}`)
+						this.$api.navigateTo(`/pages/user/order/order-pay-list?orderId=${data.orderId}`)
 					}
 				})
 				.catch(error => {
 					this.$util.msg(error.msg, 2000)
 				})
 		},
-		hanldCancelConfirm(data) {
-			//不使用余额抵扣直接跳转收银台
-			if (data.onlinePayFlag == 1) {// 只能线下
-				this.$api.navigateTo(`/pages/user/pay/card-under?orderId=${data.orderId}`)
-			} else {
-				this.$api.navigateTo(`/pages/user/order/order-pay-list?orderId=${data.orderId}`)
-			}
-		},
-		hanldConfirmFn(orderId) {
-			//确认打款供应商
-			this.$util.modal(
-				'提示',
-				'确定委托采美平台打款给供应商吗？确定之前请务必确保货品完好？',
-				'确定',
-				'取消',
-				true,
-				() => {
-					this.OrderService.confirmpayment({ orderId: orderId, userId: this.userId })
-						.then(response => {
-							this.$util.msg('确认成功', 2000, true, 'success')
-							setTimeout(() => {
-								this.getOrderDatainit(this.currentTab)
-							}, 2000)
-						})
-						.catch(error => {
-							this.$util.msg(error.msg, 2000)
-						})
+		handleClick(e) {
+			//确认操作
+			if (e.index == 1) {
+				switch (this.handleModelEven) {
+					case 1: //取消订单
+						this.cancelOrder()
+						break
+					case 2: //确认收货
+						this.confirmReceipt()
+						break
 				}
-			)
+			}
+			this.modal = false
 		},
-		handOrderConfirm() {
+		async confirmReceipt() {
 			//确认收货
-			this.$util.modal('提示', '是否确认收货', '确定', '取消', true, () => {
-				this.OrderService.ConfirmReceipt({ orderId: this.orderId })
-					.then(response => {
-						this.beansType = 7
-						this.beanNumber = 100
-						this.isActivityBean = true
-					})
-					.catch(error => {
-						this.$util.msg(error.msg, 2000)
-					})
-			})
-		},
-		handOrderConfirmation() {
-			//确认订单
-			this.$util.modal('提示', '确认此订单？', '确定', '取消', true, () => {
-				this.OrderService.AffirmOrder({ orderId: this.orderId })
-					.then(response => {
-						this.$util.msg(response.msg, 2000, true, 'success')
-						setTimeout(() => {
-							this.initOrderDetaileData()
-						}, 2000)
-					})
-					.catch(error => {
-						this.$util.msg(error.msg, 2000)
-					})
-			})
-		},
-		handOrderDetele() {
-			//删除订单
-			this.$util.modal('提示', '确认删除该订单吗？', '确定', '取消', true, () => {
-				this.OrderService.DeleteOrder({ orderId: this.orderId })
-					.then(response => {
-						this.$util.msg(response.msg, 2000, true, 'success')
-						setTimeout(() => {
-							if (this.shareType === 'share') {
-								this.$api.switchTabTo('/pages/tabBar/home/index')
-							} else {
-								this.$api.redirectTo(`/pages/user/order/order-list?type=detele&state=${this.state}`)
-							}
-						}, 500)
-					})
-					.catch(error => {
-						this.$util.msg(error.msg, 2000)
-					})
-			})
+			try {
+				const res = await this.OrderService.ConfirmReceipt({ orderId: this.orderId })
+				this.$util.msg(res.msg, 2000, true, 'success')
+				setTimeout(() => {
+					this.initOrderDetaileData()
+				}, 2000)
+			} catch (error) {
+				this.$util.msg(error.msg, 2000)
+			}
 		},
-		handCenceConfirm() {
+		async cancelOrder() {
 			//取消订单
-			this.$util.modal('提示', '确认取消该订单吗？', '确定', '取消', true, () => {
-				this.OrderService.CancelOrder({ orderId: this.orderId , userIdentity : 0})
-					.then(response => {
-						this.$util.msg(response.msg, 2000, true, 'success')
-						setTimeout(() => {
-							this.initOrderDetaileData()
-						}, 2000)
-					})
-					.catch(error => {
-						this.$util.msg(error.msg, 2000)
-					})
-			})
+			try {
+				const res = await this.OrderService.CancelOrder({ orderId: this.orderId, userIdentity: 0 })
+				this.$util.msg(res.msg, 2000, true, 'success')
+				setTimeout(() => {
+					this.initOrderDetaileData()
+				}, 2000)
+			} catch (error) {
+				this.$util.msg(error.msg, 2000)
+			}
 		},
 		onShareAppMessage(res) {
 			//分享转发
@@ -479,14 +311,9 @@ export default {
 			return {
 				title: '您有新的分享订单，快来查看吧~',
 				path: `/pages/user/order/order-sharelogin?orderId=${this.orderId}&userId=${this.userId}`,
-				imageUrl: 'https://img.caimei365.com/group1/M00/03/95/Cmis216Sk_SABnOFABZCgCzFV_g063.png'
+				imageUrl: 'https://static.caimei365.com/app/mini-mcare/icon/icon_shareOrder@2x.png'
 			}
 		},
-		hanldePopupFn(data) {
-			//监听活动内容
-			this.popupShow = true
-			this.handlerPros = data
-		},
 		getHeaderTopHeight() {
 			let statusBarHeight = this.systeminfo.statusBarHeight // 状态栏高度
 			let headerPosi = this.headerBtnPosi
@@ -517,11 +344,6 @@ export default {
 				}
 			})
 			return systeminfo
-		},
-		handleBeanlClick() {
-			//关闭采美豆弹窗
-			this.isActivityBean = false
-			this.initOrderDetaileData()
 		}
 	},
 	onShow() {}
@@ -536,13 +358,13 @@ page {
 .details {
 	padding-bottom: 130rpx;
 }
-.return-instructions{
-    font-size: 26rpx;
-    color: #F3B574;
-    line-height: 42rpx;
-    padding: 32rpx 50rpx;
-    background-color: #FFFAF8;
-    text-align: justify;
+.return-instructions {
+	font-size: 26rpx;
+	color: #f3b574;
+	line-height: 42rpx;
+	padding: 32rpx 50rpx;
+	background-color: #fffaf8;
+	text-align: justify;
 }
 .btn-hover {
 	background: #ffffff;

pages/user/order/order-list.vue

@@ -8,331 +8,259 @@
 			:isDelete="isDelete"
 			@goSearchPath="handlSearchPath"
 		></header-back>
-		<view class="order-section-top" :style="{ marginTop: navbarHeight + 'px' }">
-			<scroll-view scroll-x scroll-with-animation class="tab-view" :scroll-left="scrollLeft">
-				<view
-					v-for="(item, index) in orderTabBar"
-					:key="index"
-					class="tab-bar-item"
-					:class="[currentTab == index ? 'active' : '']"
-					:data-current="index"
-					@tap.stop="onClickTab"
-				>
-					<text class="tab-bar-title">{{ item.text }}</text>
-				</view>
-			</scroll-view>
-		</view>
-		<swiper
-			class="tab-content"
-			:current="currentTab"
-			duration="80"
-			@animationfinish="onChange"
-			:style="{ height: winHeight + 'px' }"
-		>
-			<swiper-item v-for="(tabItem, index) in orderTabBar" :key="index">
-				<tui-skeleton
-					v-if="skeletonShow"
-					backgroundColor="#fafafa"
-					borderRadius="10rpx"
-					:isLoading="false"
-					:loadingType="5"
-				></tui-skeleton>
-				<scroll-view scroll-y class="scoll-y tui-skeleton" @scrolltolower="scrolltolower">
-					<view :class="{ 'tui-order-list': scrollTop >= 0 }" class="tui-skeleton clearfix">
-						<!-- 空白页 -->
-						<empty
-							v-if="tabItem.loaded === true && tabItem.orderList.length === 0"
-							:typeIndex="currentTab"
-							:navbarHeight="navbarHeight"
-						></empty>
-						<!-- 列表 -->
-						<view v-else class="tui-order-content">
-							<view
-								class="tui-order-item"
-								v-for="(order, orderIndex) in tabItem.orderList"
-								:key="orderIndex"
-							>
-								<view class="order-title">
-									<view class="order-title-t">
-										<text
-											class="bage-buss tui-skeleton-fillet"
-											v-if="order.orderSubmitType == 3 || order.orderSubmitType == 4"
-											>协销</text
-										>
-										<text
-											class="bage-auto tui-skeleton-fillet"
-											v-if="
-												order.orderSubmitType == 0 ||
-													order.orderSubmitType == 1 ||
-													order.orderSubmitType == 2
-											"
-											>自主</text
-										>
-										<text class="bage-text tui-skeleton-fillet">订单编号：{{ order.orderNo }}</text>
-										<image
-											class="bage-icon"
-											src="https://static.caimei365.com/app/img/icon/icon-type@3x.png"
-											mode="widthFix"
-											v-if="order.secondHandOrderFlag == 1"
-										></image>
-									</view>
-									<view class="order-title-b">
-										<view class="order-title-btxt tui-skeleton-fillet"
-											>下单时间：{{ order.orderTime }}</view
-										>
-										<view class="order-title-tip tui-skeleton-fillet">{{
-											StateExpFormat(order.status)
-										}}</view>
-									</view>
-								</view>
-								<block v-for="(shop, sindex) in order.shopOrderList" :key="sindex">
-									<view class="goods-title">
-										<view v-if="shop.shopPromotion" class="floor-item-act">
-											<view class="floor-tags">{{ shop.shopPromotion.name }}</view>
+		<tui-skeleton
+			v-if="skeletonShow"
+			backgroundColor="#fafafa"
+			borderRadius="10rpx"
+			:isLoading="true"
+			:loadingType="5"
+		></tui-skeleton>
+		<template v-else>
+			<view class="order-section-top" :style="{ marginTop: navbarHeight + 'px' }">
+				<scroll-view scroll-x scroll-with-animation class="tab-view" :scroll-left="scrollLeft">
+					<view
+						v-for="(item, index) in orderTabBar"
+						:key="index"
+						class="tab-bar-item"
+						:class="[currentTab == index ? 'active' : '']"
+						:data-current="index"
+						@tap.stop="onClickTab"
+					>
+						<text class="tab-bar-title">{{ item.text }}</text>
+					</view>
+				</scroll-view>
+			</view>
+			<swiper
+				class="tab-content"
+				:current="currentTab"
+				duration="80"
+				@animationfinish="onChange"
+				:style="{ height: winHeight + 'px' }"
+			>
+				<swiper-item v-for="(tabItem, index) in orderTabBar" :key="index">
+					<scroll-view scroll-y class="scoll-y tui-skeleton" @scrolltolower="scrolltolower">
+						<view :class="{ 'tui-order-list': scrollTop >= 0 }" class="tui-skeleton clearfix">
+							<!-- 空白页 -->
+							<empty
+								v-if="tabItem.loaded === true && tabItem.orderList.length === 0"
+								:typeIndex="currentTab"
+								:navbarHeight="navbarHeight"
+							></empty>
+							<!-- 列表 -->
+							<view v-else class="tui-order-content">
+								<view
+									class="tui-order-item"
+									v-for="(order, orderIndex) in tabItem.orderList"
+									:key="orderIndex"
+								>
+									<view class="order-title">
+										<view class="order-title-t">
+											<text class="bage-text tui-skeleton-fillet">订单编号：{{ order.orderNo }}</text>
 										</view>
-										<view class="title-text" v-if="order.secondHandOrderFlag == 1"
-											>{{ shop.shopName }}
-											<label class="paymenttext" v-if="order.affirmPaymentFlag == 1"
-												>已确认打款供应商</label
+										<view class="order-title-b">
+											<view class="order-title-btxt tui-skeleton-fillet"
+												>下单时间：{{ order.orderTime }}</view
 											>
+											<view class="order-title-tip tui-skeleton-fillet">{{
+												StateExpFormat(order.status)
+											}}</view>
 										</view>
-										<view
-											class="title-text tui-skeleton-fillet"
-											v-else
-											@click="goShophome(shop)"
-											>{{ shop.shopName }}<label class="iconfont icon-jinrudianpu"></label
-										></view>
 									</view>
-									<view
-										class="goods-item"
-										v-for="(pros, prosIndex) in shop.orderProductList"
-										:key="prosIndex"
-										@click.stop="detail(order.orderId)"
-									>
-										<view class="goods-pros-t">
-											<view class="pros-img tui-skeleton-fillet">
-												<image :src="pros.image" alt="" />
-												<text class="tips" v-if="pros.productType == 2 || pros.productType == 1"
-													>赠品</text
-												>
+									<block v-for="(shop, sindex) in order.shopOrderList" :key="sindex">
+										<view class="goods-title">
+											<view v-if="shop.shopPromotion" class="floor-item-act">
+												<view class="floor-tags">{{ shop.shopPromotion.name }}</view>
 											</view>
-											<view class="pros-product clearfix">
-												<view class="producttitle tui-skeleton-fillet">{{ pros.name }}</view>
-												<view
-													class="productspec tui-skeleton-fillet"
-													v-if="pros.productCategory != 2"
-													>规格:{{ pros.productUnit }}</view
+											<view class="title-text" v-if="order.secondHandOrderFlag == 1"
+												>{{ shop.shopName }}
+												<label class="paymenttext" v-if="order.affirmPaymentFlag == 1"
+													>已确认打款供应商</label
 												>
-												<view class="productprice">
+											</view>
+											<view
+												class="title-text tui-skeleton-fillet"
+												v-else
+												>{{ shop.shopName }}<label class="iconfont icon-jinrudianpu"></label
+											></view>
+										</view>
+										<view
+											class="goods-item"
+											v-for="(pros, prosIndex) in shop.orderProductList"
+											:key="prosIndex"
+											@click.stop="detail(order.orderId)"
+										>
+											<view class="goods-pros-t">
+												<view class="pros-img tui-skeleton-fillet">
+													<image :src="pros.image" alt="" />
+												</view>
+												<view class="pros-product clearfix">
+													<view class="producttitle tui-skeleton-fillet">{{ pros.name }}</view>
 													<view
-														class="price tui-skeleton-fillet"
-														:class="
-															pros.svipPriceFlag == 1 ||
-															PromotionsFormat(pros.productPromotion)
-																? 'none'
-																: ''
-														"
+														class="productspec tui-skeleton-fillet"
+														v-if="pros.productCategory != 2"
+														>规格:{{ pros.productUnit }}</view
 													>
-														<text>￥{{ pros.price | NumFormat }}</text>
-													</view>
-													<view class="count tui-skeleton-fillet">
-														<text class="small">x</text>{{ pros.num }}
-													</view>
-												</view>
-												<view class="floor-item-act">
-													<template v-if="pros.productPromotion">
-														<view
-															v-if="PromotionsFormat(pros.productPromotion)"
-															class="floor-tags"
-															@click.stop="clickPopupShow(pros.productPromotion)"
-														>
-															{{ pros.productPromotion.name }}
-															<text
-																v-if="
-																	pros.productPromotion != null &&
-																		pros.productPromotion.type != 3
-																"
-															>
-																:￥{{
-																	pros.productPromotion == null
-																		? '0.00'
-																		: pros.productPromotion.touchPrice | NumFormat
-																}}
-															</text>
+													<view class="productprice">
+														<view class="price tui-skeleton-fillet">
+															<text>￥{{ pros.price | NumFormat }}</text>
 														</view>
-														<view
-															v-else-if="pros.productPromotion.type != 3"
-															class="floor-tags"
-															@click.stop="clickPopupShow(pros.productPromotion)"
-															>{{ pros.productPromotion.name }}</view
-														>
-													</template>
-													<template v-if="pros.svipPriceFlag == 1">
-														<view class="svip-tags">
-															<view class="tags">SVIP</view>
-															<view class="price">{{ pros.svipPriceTag }}</view>
+														<view class="count tui-skeleton-fillet">
+															<text class="small">x</text>{{ pros.num }}
 														</view>
-													</template>
+													</view>
 												</view>
 											</view>
 										</view>
-									</view>
-								</block>
-								<view class="order-footer">
-									<view class="order-footer-top" v-if="order.discountFee != 0"
-										>经理折扣：¥{{ order.discountFee | NumFormat }}</view
-									>
-									<view class="order-footer-bot">
-										<view class="count tui-skeleton-fillet">共{{ order.productCount }}件商品</view>
-										<view
-											class="money tui-skeleton-fillet"
-											v-if="order.status == 31 || order.status == 32 || order.status == 33"
-										>
-											已支付：<label style="color:#f94b4b ;"
-												>¥{{ order.receiptAmount | NumFormat }}</label
-											>
-										</view>
-										<view class="money tui-skeleton-fillet" v-else>
-											待付总额：<label style="color:#f94b4b ;"
-												>¥{{ order.pendingPayments | NumFormat }}</label
+									</block>
+									<view class="order-footer">
+										<view class="order-footer-bot">
+											<view class="count tui-skeleton-fillet">共{{ order.productCount }}件商品</view>
+											<view
+												class="money tui-skeleton-fillet"
+												v-if="order.status == 31 || order.status == 32 || order.status == 33"
 											>
+												已支付：<label style="color:#f94b4b ;"
+													>¥{{ order.receiptAmount | NumFormat }}</label
+												>
+											</view>
+											<view class="money tui-skeleton-fillet" v-else>
+												待付总额：<label style="color:#f94b4b ;"
+													>¥{{ order.pendingPayments | NumFormat }}</label
+												>
+											</view>
 										</view>
 									</view>
+									<!-- 底部button -->
+									<order-button
+										ref="orderButton"
+										:status="order.status"
+										:order="order"
+										@buttonConfirm="handButtonConfirm"
+									>
+									</order-button>
 								</view>
-								<!-- 底部button -->
-								<order-button
-									ref="orderButton"
-									:status="order.status"
-									:order="order"
-									@buttonConfirm="handButtonConfirm"
-								>
-								</order-button>
+								<!--加载loadding-->
+								<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
+								<tui-nomore
+									:visible="!pullUpOn"
+									:backgroundColor="'#ffffff'"
+									:text="nomoreText"
+								></tui-nomore>
+								<!--加载loadding-->
 							</view>
-							<!--加载loadding-->
-							<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
-							<tui-nomore
-								:visible="!pullUpOn"
-								:backgroundColor="'#ffffff'"
-								:text="nomoreText"
-							></tui-nomore>
-							<!--加载loadding-->
 						</view>
-					</view>
-				</scroll-view>
-			</swiper-item>
-		</swiper>
-		<!-- 付款弹窗 -->
-		<order-model
-			v-if="isPayModel"
-			:payModelData="payModelData"
-			:modelType="modelType"
-			@cancelConfirm="hanldCancelConfirm"
-			@paymentConfirm="hanldPaymentConfirm"
-		/>
+					</scroll-view>
+				</swiper-item>
+			</swiper>
+		</template>
 		<!-- 分享弹窗 -->
-		<share-alert v-if="isShareModal" :orderId="btnoRderID" @shareConfirm="onShareAppMessage" />
+		<share-alert v-if="isShareModal" :orderId="handleOrderId" @shareConfirm="onShareAppMessage" />
+		<!-- 提示弹窗 -->
+		<tui-modal
+			:show="modal"
+			@click="handleClick"
+			:content="contentModalText"
+			:button="modalButton"
+			color="#333"
+			:size="32"
+			shape="circle"
+			:maskClosable="false"
+		>
+		</tui-modal>
 		<!-- 透明模态层 -->
 		<modal-layer v-if="isModalLayer"></modal-layer>
-		<!-- 采美豆提示弹窗 -->
-		<activityBean
-			v-if="isActivityBean"
-			:show="isActivityBean"
-			:beansType="beansType"
-			:beanNumber="beanNumber"
-			@cancel="handleBeanlClick"
-		></activityBean>
 	</view>
 </template>
 
 <script>
 import headerBack from '@/components/cm-module/headerNavbar/header-back' //自定义导航
 import btSearch from '@/components/uni-search/bt-search.vue' //搜索
-import tuiLoadmore from '@/components/tui-components/loadmore/loadmore'
-import tuiNomore from '@/components/tui-components/nomore/nomore'
 import orderButton from '@/components/cm-module/orderDetails/orderListButton' //按钮
 import modalLayer from '@/components/modal-layer'
 import empty from './components/empty'
 import shareAlert from '@/components/cm-module/modelAlert/shareAlert' //分享弹窗
-import orderModel from '@/components/cm-module/modelAlert/order-alert' //付款弹窗
-import activityBean from '@/components/cm-module/activity/activityBean.vue'
 
 export default {
 	components: {
 		headerBack,
 		empty,
 		btSearch,
-		tuiLoadmore,
-		tuiNomore,
 		orderButton,
 		modalLayer,
 		shareAlert,
-		orderModel,
-		activityBean
 	},
 	data() {
 		return {
 			CustomBar: this.CustomBar, // 顶部导航栏高度
-			orderTabBar: [
-				{ state: 0, text: '全部订单', orderList: [] },
-				{ state: 1, text: '待确认', orderList: [] },
-				{ state: 2, text: '待付款', orderList: [] },
-				{ state: 3, text: '待发货', orderList: [] },
-				{ state: 4, text: '已发货', orderList: [] },
-				{ state: 5, text: '退货/款', orderList: [] }
-			],
 			headerBtnPosi: this.setHeaderBtnPosi(), //获取设备顶部胶囊高度
 			systeminfo: this.setSysteminfo(), //获取设备信息
+			winHeight: '', //窗口高度
 			nvabarData: {
 				//顶部自定义导航
 				showCapsule: 1, // 是否显示左上角图标  1表示显示  0表示不显示,
 				showSearch: 1,
 				title: '我的订单' // 导航栏 中间的标题
 			},
-			winHeight: '', //窗口高度
+			orderTabBar: [
+				{ state: 0, text: '全部订单', orderList: [] },
+				{ state: 1, text: '待付款', orderList: [] },
+				{ state: 2, text: '待发货', orderList: [] },
+				{ state: 3, text: '已发货', orderList: [] },
+				{ state: 4, text: '退货/款', orderList: [] }
+			],
 			currentTab: 0, //预设当前项的值
 			scrollLeft: 0, //tab标题的滚动条位置
-			userId: 0,
+			listQuery:{
+				orderState: 0, 
+				userId:0, 
+				pageNum: 1, 
+				pageSize: 10
+			},
 			orderData: [],
-			btnoRderID: 0, //点击按钮传入的的订单ID
-			pageNum: 1, //页数
-			pageSize: 10, //条数
 			scrollTop: 0,
 			skeletonShow: true,
 			isDelete: false,
 			isClickChange: false,
 			isShareModal: false, //控制分享弹窗
 			isModalLayer: false,
-			isPayModel: false,
 			loadding: false,
 			pullUpOn: true,
 			hasNextPage: false,
 			pullFlag: true,
 			navbarHeight: '',
-			payModelData: {},
-			hanldOrderData: {},
 			modelType: 0,
 			nomoreText: '上拉显示更多',
 			isOnloadFlag: false,
-			beansType: 1,
-			beanNumber: 0,
-			isActivityBean: false
+			handleOrderId: 0, //点击按钮传入的的订单ID
+			handleModelEven:0,
+			modal:false,
+			contentModalText: '订单查询失败,请稍候重试~', //操作文字提示语句
+			modalButton: [
+				{
+					text: '取消',
+					type: 'gray',
+					plain: true //是否空心
+				},
+				{
+					text: '确定',
+					customStyle: {
+						color: '#fff',
+						bgColor: 'linear-gradient(90deg, #F28F31 0%, #F3B574 100%)'
+					},
+					plain: false
+				}
+			]
 		}
 	},
 	onLoad(e) {
-		let self = this
+		
 		if (e.type === 'detele') {
 			this.isDelete = true
 		}
 		this.currentTab = e.state
 		this.isOnloadFlag = true
 		this.getHeaderTopHeight() //设置自定义导航高度
-		//  高度自适应
-		uni.getSystemInfo({
-			success: function(res) {
-				let calc = res.windowHeight
-				self.winHeight = calc - self.CustomBar
-			}
-		})
+		this.initStorage()
 	},
 	filters: {
 		NumFormat(value) {
@@ -341,11 +269,11 @@ export default {
 		}
 	},
 	methods: {
-		goShophome(shop) {
-			if(shop.shopType === 2){
-				return
-			}
-			this.$api.navigateTo(`/pages/supplier/user/my-shop?shopId=${shop.shopId}`)
+		async initStorage(){
+			//初始化
+			const usrInfo = await this.$api.getStorage()
+			this.listQuery.userId = usrInfo.userId ? usrInfo.userId : 0
+			this.getOrderDatainit(this.currentTab)
 		},
 		// 滚动切换标签样式
 		onChange: function(e) {
@@ -389,88 +317,70 @@ export default {
 				this.scrollLeft = 0
 			}
 		},
-		getOrderDatainit(index, source) {
-			/**
-			 * @订单初始化加载  仅加载第一页码
-			 * @param：orderState(订单状态:0全部,1待付款,2待发货,3已发货,4退货款)
-			 * @param：userId(用户ID)
-			 * @param：pageNum(页码数)
-			 * @param：pageSize(每页条数)
-			 * @param：organizeID(全局变量组织ID)
-			 */
-
-			setTimeout(() => {
-				this.skeletonShow = false
-				this.isOnloadFlag = false
-			}, 1500)
+		async getOrderDatainit(index, source) {
 			let orderItem = this.orderTabBar[index]
 			if (source === 'tabChange' && orderItem.loaded === true) {
 				//tab切换只有第一次需要加载数据
 				return
 			}
-			setTimeout(() => {
-				this.$api.getStorage().then(resolve => {
-					this.userId = resolve.userId ? resolve.userId : 0
-					let params = { orderState: index, userId: this.userId, pageNum: 1, pageSize: this.pageSize }
-					this.OrderService.QueryOrderList(params)
-						.then(response => {
-							let data = response.data
-							let orderList = data.list.filter(item => {
-								//添加不同状态下订单的表现形式
-								item = Object.assign(item, this.StateExpFormat(item.status))
-								return item
-							})
-							orderItem.orderList = []
-							orderList.forEach(item => {
-								orderItem.orderList.push(item)
-							})
-							//loaded新字段用于表示数据加载完毕，如果为空可以显示空白页
-							this.$set(orderItem, 'loaded', true)
-							this.hasNextPage = data.hasNextPage
-							if (this.hasNextPage) {
-								this.pullUpOn = false
-								this.nomoreText = '上拉显示更多'
-							} else {
-								if (orderItem.orderList.length < 2) {
-									this.pullUpOn = true
-								} else {
-									this.pullUpOn = false
-									this.nomoreText = '已至底部'
-								}
-							}
-						})
-						.catch(error => {
-							this.$util.msg(error.msg, 2000)
-						})
+			try{
+				this.listQuery.orderState = index
+				const res = await this.OrderService.QueryOrderList(this.listQuery)
+				const data = res.data
+				const orderList = data.list.filter(item => {
+					//添加不同状态下订单的表现形式
+					item = Object.assign(item, this.StateExpFormat(item.status))
+					return item
 				})
-			}, 600)
-		},
-		getOnReachBottomData(index) {
-			//上拉加载
-			this.pageNum += 1
-			let params = { orderState: index, userId: this.userId, pageNum: this.pageNum, pageSize: this.pageSize }
-			this.OrderService.QueryOrderList(params)
-				.then(response => {
-					let data = response.data
-					let orderItem = this.orderTabBar[index]
-					this.hasNextPage = data.hasNextPage
-					orderItem.orderList = orderItem.orderList.concat(data.list)
-					this.pullFlag = false // 防上拉暴滑
-					setTimeout(() => {
-						this.pullFlag = true
-					}, 500)
-					if (this.hasNextPage) {
-						this.pullUpOn = false
-						this.nomoreText = '上拉显示更多'
+				orderItem.orderList = []
+				orderList.forEach(item => {
+					orderItem.orderList.push(item)
+				})
+				//loaded新字段用于表示数据加载完毕，如果为空可以显示空白页
+				this.$set(orderItem, 'loaded', true)
+				this.hasNextPage = data.hasNextPage
+				if (this.hasNextPage) {
+					this.pullUpOn = false
+					this.nomoreText = '上拉显示更多'
+				} else {
+					if (orderItem.orderList.length < 2) {
+						this.pullUpOn = true
 					} else {
-						this.loadding = false
 						this.pullUpOn = false
 						this.nomoreText = '已至底部'
 					}
-				})
-				.catch(error => {
-					this.$util.msg(error.msg, 2000)
-				})
+				}
+				this.skeletonShow = false
+				this.isOnloadFlag = false
+			}catch(error){
+				this.$util.msg(error.msg, 2000)
+			}
+		},
+		async getOnReachBottomData(index) {
+			//上拉加载
+			try{
+				this.listQuery.pageNum += 1
+				this.listQuery.orderState = index
+				const res = await this.OrderService.QueryOrderList(this.listQuery)
+				const data = res.data
+				const orderItem = this.orderTabBar[index]
+				this.hasNextPage = data.hasNextPage
+				orderItem.orderList = orderItem.orderList.concat(data.list)
+				this.pullFlag = false // 防上拉暴滑
+				setTimeout(() => {
+					this.pullFlag = true
+				}, 500)
+				if (this.hasNextPage) {
+					this.pullUpOn = false
+					this.nomoreText = '上拉显示更多'
+				} else {
+					this.loadding = false
+					this.pullUpOn = false
+					this.nomoreText = '已至底部'
+				}
+			}catch(error){
+				this.$util.msg(error.msg, 2000)
+			}
 		},
 		scrolltolower() {
 			if (this.hasNextPage) {
@@ -486,176 +396,78 @@ export default {
 		},
 		handButtonConfirm(data) {
 			//获取点击
-			this.handShowAlert(data)
-			this.btnoRderID = data.orderId
-		},
-		handShowAlert(data) {
-			//执行
+			this.handleOrderId = data.orderId
 			switch (data.type) {
-				case 'delete':
-					this.handOrderDetele(data.orderId)
-					break
 				case 'cancel':
-					this.handCenceConfirm(data.orderId)
+					//取消订单
+					this.modal = true
+					this.contentModalText = '确认取消该订单吗？'
+					this.handleModelEven = 1
 					break
 				case 'query':
-					this.isModalLayer = true
-					this.$api.navigateTo('/pages/user/order/order-logistics?orderId=' + data.orderId)
+					this.$api.navigateTo('/pages/user/order/order-logistics?orderId=' + this.handleOrderId)
 					break
 				case 'confirm':
-					this.handOrderConfirm(data.orderId)
+					//确认收货
+					this.modal = true
+					this.contentModalText = '确认收货吗？'
+					this.handleModelEven = 2
 					break
 				case 'pay':
-					this.hanldOrderData = data.order
-					this.getOrderPaymentValidation(data)
-					break
-				case 'confirmation':
-					this.handOrderConfirmation(data.orderId)
-					break
-				case 'payment':
-					this.hanldConfirmFn(data.orderId)
+					this.orderPaymentValidation()
 					break
 			}
 		},
-		getOrderPaymentValidation(data) {
+		async orderPaymentValidation(){
 			//监听根据付款状态做操作
-			this.OrderService.OrderPaymentValidation({ orderId: data.orderId })
-				.then(response => {
-					let data = response.data
-					this.payModelData = data
-					if(data.balanceFlag == 1){// 0可以走余额抵扣，1不能走余额抵扣
-						this.$api.navigateTo(`/pages/user/order/order-pay-list?orderId=${data.orderId}`)
-					}else{
-						switch (data.code) {
-							case 1:
-								this.isPayModel = true
-								this.modelType = 1
-								break
-							case 2:
-								this.isPayModel = true
-								this.modelType = 2
-								break
-							case -1:
-								this.$util.modal('', '订单已申请全部退款，无需再付款！', '确定', '', false, () => {})
-								break
-							default:
-								if (data.onlinePayFlag == 1) {// 只能线下
-									this.$api.navigateTo(`/pages/user/pay/card-under?orderId=${data.orderId}`)
-								} else {
-									this.$api.navigateTo(`/pages/user/order/order-pay-list?orderId=${data.orderId}`)
-								}
-						}
-					}
-				})
-				.catch(error => {
-					this.$util.msg(error.msg, 2000)
-				})
-		},
-		hanldPaymentConfirm(data) {
-			//余额抵扣跳转
-			this.OrderService.OrderBalanceDeduction({ orderId: data.order.orderId })
-				.then(response => {
-					if (data.type === 2) {
-						let _data = { orderId: data.order.orderId }
-						this.$api.navigateTo(
-							`/pages/user/order/success?type=deduction&data=${JSON.stringify({ data: _data })}`
-						)
-					} else {
-						this.$api.navigateTo(`/pages/user/pay/card-under?orderId=${data.order.orderId}`)
-					}
-				})
-				.catch(error => {
-					this.$util.msg(error.msg, 2000)
-				})
-		},
-		hanldCancelConfirm(data) {
-			//不使用余额抵扣直接跳转收银台
-			if (data.onlinePayFlag === 1) {// 只能线下
-				this.$api.navigateTo(`/pages/user/pay/card-under?orderId=${data.orderId}`)
-			} else {
-				this.$api.navigateTo(`/pages/user/order/order-pay-list?orderId=${data.orderId}`)
+			try{
+				const res = this.OrderService.OrderPaymentValidation({ orderId: this.handleOrderId })
+				if (res.data.onlinePayFlag == 1) {// 只能线下
+					this.$api.navigateTo(`/pages/user/pay/card-under?orderId=${this.handleOrderId}`)
+				} else {
+					this.$api.navigateTo(`/pages/user/order/order-pay-list?orderId=${this.handleOrderId}`)
+				}
+			}catch(error){
+				this.$util.msg(error.msg, 2000)
 			}
 		},
-		hanldConfirmFn(orderId) {
-			//确认打款供应商
-			this.$util.modal(
-				'提示',
-				'确定委托采美平台打款给供应商吗？确定之前请务必确保货品完好？',
-				'确定',
-				'取消',
-				true,
-				() => {
-					this.OrderService.confirmpayment({ orderId: orderId })
-						.then(response => {
-							this.$util.msg('确认成功', 2000, true, 'success')
-							setTimeout(() => {
-								this.getOrderDatainit(this.currentTab)
-							}, 2000)
-						})
-						.catch(error => {
-							this.$util.msg(error.msg, 2000)
-						})
+		handleClick(e){
+			//确认操作
+			if (e.index == 1) {
+				switch(this.handleModelEven){
+					case 1://取消订单
+						this.cancelOrder()
+					 break
+					case 2://确认收货
+						this.confirmReceipt()
+					 break
 				}
-			)
+			}
+			this.modal = false
 		},
-		handOrderConfirm(orderId) {
+		async confirmReceipt(){
 			//确认收货
-			this.$util.modal('提示', '是否确认收货', '确定', '取消', true, () => {
-				this.OrderService.ConfirmReceipt({ orderId: orderId })
-					.then(response => {
-						this.beansType = 7
-						this.beanNumber = 100
-						this.isActivityBean = true
-					})
-					.catch(error => {
-						this.$util.msg(error.msg, 2000)
-					})
-			})
-		},
-		handOrderConfirmation(orderId) {
-			//确认订单
-			this.$util.modal('提示', '确认此订单？', '确定', '取消', true, () => {
-				this.OrderService.AffirmOrder({ orderId: orderId })
-					.then(response => {
-						this.$util.msg(response.msg, 2000, true, 'success')
-						setTimeout(() => {
-							this.getOrderDatainit(this.currentTab)
-						}, 2000)
-					})
-					.catch(error => {
-						this.$util.msg(error.msg, 2000)
-					})
-			})
-		},
-		handOrderDetele(orderId) {
-			//删除订单
-			this.$util.modal('提示', '确认删除该订单吗？', '确定', '取消', true, () => {
-				this.OrderService.DeleteOrder({ orderId: orderId })
-					.then(response => {
-						this.$util.msg(response.msg, 2000, true, 'success')
-						setTimeout(() => {
-							this.getOrderDatainit(this.currentTab)
-						}, 2000)
-					})
-					.catch(error => {
-						this.$util.msg(error.msg, 2000)
-					})
-			})
+			try{
+				const res = await this.OrderService.ConfirmReceipt({ orderId: this.handleOrderId })
+				this.$util.msg(res.msg, 2000, true, 'success')
+				setTimeout(() => {
+					this.getOrderDatainit(this.currentTab)
+				}, 2000)
+			}catch(error){
+				this.$util.msg(error.msg, 2000)
+			}
 		},
-		handCenceConfirm(orderId) {
+		async cancelOrder(){
 			//取消订单
-			this.$util.modal('提示', '确认取消该订单吗？', '确定', '取消', true, () => {
-				this.OrderService.CancelOrder({ orderId: orderId , userIdentity : 0})
-					.then(response => {
-						this.$util.msg(response.msg, 2000, true, 'success')
-						setTimeout(() => {
-							this.getOrderDatainit(this.currentTab)
-						}, 2000)
-					})
-					.catch(error => {
-						this.$util.msg(error.msg, 2000)
-					})
-			})
+			try{
+				const res = await this.OrderService.CancelOrder({ orderId: this.handleOrderId, userIdentity : 0 })
+				this.$util.msg(res.msg, 2000, true, 'success')
+				setTimeout(() => {
+					this.getOrderDatainit(this.currentTab)
+				}, 2000)
+			}catch(error){
+				this.$util.msg(error.msg, 2000)
+			}
 		},
 		handlSearchPath() {
 			this.$api.navigateTo('/pages/search/search-order')
@@ -668,8 +480,8 @@ export default {
 			}
 			return {
 				title: '您有新的分享订单，快来查看吧~',
-				path: `/pages/user/order/order-sharelogin?orderId=${this.btnoRderID}&userId=${this.userId}`,
-				imageUrl: 'https://img.caimei365.com/group1/M00/03/95/Cmis216Sk_SABnOFABZCgCzFV_g063.png'
+				path: `/pages/user/order/order-sharelogin?orderId=${this.handleOrderId}&userId=${this.userId}`,
+				imageUrl: 'https://static.caimei365.com/app/mini-mcare/icon/icon_shareOrder@2x.png'
 			}
 		},
 		orderPriceToFixed(n) {
@@ -679,6 +491,7 @@ export default {
 		},
 		getHeaderTopHeight() {
 			// 状态栏高度
+			let self = this
 			let statusBarHeight = this.systeminfo.statusBarHeight
 			let headerPosi = this.headerBtnPosi
 			let btnPosi = {
@@ -693,6 +506,13 @@ export default {
 				right: this.systeminfo.screenWidth - headerPosi.right
 			}
 			this.navbarHeight = headerPosi.bottom + btnPosi.bottom // 原胶囊bottom + 现胶囊bottom
+			//  高度自适应
+			uni.getSystemInfo({
+				success: function(res) {
+					let calc = res.windowHeight
+					self.winHeight = calc - self.CustomBar
+				}
+			})
 		},
 		setHeaderBtnPosi() {
 			// 获得胶囊按钮位置信息
@@ -759,7 +579,6 @@ export default {
 	},
 	onShow() {
 		this.isModalLayer = false
-		this.getOrderDatainit(this.currentTab)
 	}
 }
 </script>

pages/user/order/order-payhlb.vue

@@ -1,760 +0,0 @@
-<template>
-	<view class="container cashier"  v-show="isRepuest">
-		<cu-custom :navbar-data='nvabarData' @navigateBack="hanldNavigateBack"></cu-custom>
-		<view class="container-cash clearfix" :style="{marginTop:CustomBar+'px'}">
-			<view class="container-wrapper">
-				<view class="pay-content">
-					<view class="pay-top">
-						<view class="pay-paid">
-							<text class="txt-m">待付金额</text>
-							<text class="txt-b"><text class="small">￥</text>{{obligation | NumFormat}}</text>
-						</view>
-						<view class="pay-payd">
-							<view class="pay-paids">
-								<text class="txt-m">应付总额</text>
-								<text class="txt-b">￥{{payableAmount | NumFormat}}</text>
-							</view>
-							<view class="pay-paids">
-								<text class="txt-m">已支付金额</text>
-								<text class="txt-b">￥{{receiptAmount | NumFormat}}</text>
-							</view>
-						</view>
-					</view>
-					<view class="pay-bot">
-						<view class="bot-title"><text>本次支付金额</text></view>
-						<view class="bot-input">
-							<text>￥</text>
-							<input  class="input"
-									type="digit"
-									v-model="payAmount"
-									@focus="focusInput"
-									@blur="blurInput"
-									placeholder="输入金额不能大于待付金额"
-									placeholder-class="placeholder"/>
-						</view>
-						<view class="bot-resid">
-							<text class="bot-resid-le">应付剩余￥{{balanceAmount|NumFormat}}</text>
-							<text class="bot-resid-ri">支付记录 <text class="iconfont icon-xiangyou"></text> </text>
-						</view>
-					</view>
-				</view>
-				<view class="pay-record" :style="{paddingBottom:isIphoneX ? '156rpx' : '112rpx'}">
-					<view class="record-title"><text>支付记录</text></view>
-					<view class="record-list">
-						<view class="list-main" v-if="discernReceipt.length>0">
-							<view class="list-item" v-for="(item,index) in discernReceipt" :key="index">
-								<text class="text row-1">￥{{item.receiptAmount | NumFormat}}</text>
-								<text class="text row-2">{{payTypeText(item.payType)}}</text>
-								<text class="text row-3">{{item.receiptDate}}</text>
-							</view>
-						</view>
-						<view class="list-none" v-else>暂无支付记录</view>
-					</view>
-				</view>
-			</view>
-			<view class="pay-button" :style="{paddingBottom:isIphoneX ? '68rpx' : '24rpx'}">
-				<view class="btn" @click.stop="buttonSubMit" :style="{'background':btnColor}">{{buttonText}}</view>
-			</view>
-		</view>
-		<view class="alert spec" :class="specClass" v-if="isShowTip">
-			<!-- 选择支付弹窗说明 -->
-			<view class="freight-alert"  @tap="hideTips">
-				<view class="content">
-					<view class="title">
-						<text>支付链接</text>
-						<text class="iconfont icon-iconfontguanbi" @click.stop="hideTips"></text>
-					</view>
-					<view class="text-content">
-						<view class="text">请复制以下链接，并发送至电脑端，在浏览器访问该链接并选择银行尽快完成支付</view>
-						<view class="text-p">{{payHttpUrl}}</view>
-						<view class="text-b">链接有效期为72小时</view>
-					</view>
-					<view class="text-button" @click.stop="clipboard(payHttpUrl)">复制链接</view>
-				</view>
-			</view>
-		</view>
-		<!-- 弹窗提示 -->
-		<tui-modal
-			:show="modal"
-			@click="handleClick"
-			:content="contentModalText"
-			:button="modalButton"
-			color="#333"
-			:size="32"
-			shape="circle"
-			:maskClosable="false"
-		>
-		</tui-modal>
-	</view>
-</template>
-
-<script>
-	import authorize from '@/common/config/authorize.js'
-	import thorui from '@/components/clipboard/clipboard.thorui.js'
-	import payMixins from '@/mixins/payMixins.js'
-	export default{
-		mixins: [payMixins],
-		data(){
-			return{
-				orderId:0,
-				shopOrderId:0,
-				shopOrderInfo:0,
-				payType:'',
-				payWay:'',
-				isRepuest:false,
-				realPay:0,//应付金额
-				payableAmount:0,// 应付总额
-				receiptAmount:0,// 已付金额
-				obligation:0,//待付金额
-				balanceAmount:0,
-				payAmount:0,
-				nvabarData: {		//顶部自定义导航
-					showCapsule:1, // 是否显示左上角图标  1表示显示  0表示不显示,
-					showSearch: 0,
-					title: '收银台',  // 导航栏 中间的标题
-					haveBack:true,
-					textLeft:this.$store.state.isIphone
-				},
-				idCardList:[],
-				isIphoneX:this.$store.state.isIphoneX,
-				CustomBar:this.CustomBar,// 顶部导航栏高度
-				tabCurrentIndex:0,
-				isShowTip:false,
-				buttonText:'去支付',
-				btnColor:'#09BB07',
-				discernReceipt:[],
-				showDigitKeyboard:false,
-				payHttpUrl:'',
-				mbOrderId:0, // 支付记录订单Id
-				modal:false,
-				contentModalText: '本次支付金额已超出微信支付限额，请输入小于5千的金额。', //操作文字提示语句
-				modalButton: [
-					{
-						text: '知道了',
-						customStyle: {
-							color: '#fff',
-							bgColor: 'linear-gradient(90deg, #F28F31 0%, #F3B574 100%)'
-						},
-						plain: false
-					}
-				],
-			}
-		},
-		onLoad(option) {
-			this.initData(option)
-		},
-		filters: {
-			NumFormat(value) {
-				if(!value) return '0.00'
-				/*原来用的是Number(value).toFixed(0)，这样取整时有问题，例如0.51取整之后为1，感谢Nils指正*/
-				/*后来改成了 Number(value)|0,但是输入超过十一位就为负数了，具体见评论 */
-				var intPart = Number(value) - Number(value)%1 //获取整数部分（这里是windy93的方法）
-				var intPartFormat = intPart.toString().replace(/(\d)(?=(?:\d{3})+$)/g, '$1,') //将整数部分逢三一断
-				var floatPart = '.00' //预定义小数部分
-				var value2Array = value.toString().split('.')
-				//=2表示数据有小数位
-				if(value2Array.length == 2) {
-					floatPart = value2Array[1].toString() //拿到小数部分
-					if(floatPart.length == 1) { //补0,实际上用不着
-						return intPartFormat + '.' + floatPart + '0'
-					} else {
-						return intPartFormat + '.' + floatPart
-					}
-				} else {
-					return intPartFormat + floatPart
-				}
-			}
-		},
-		methods:{
-			initData(e){
-				this.payType = e.type
-				console.log(this.payType)
-				this.shopOrderId = e.shopOrderId
-				switch(this.payType){
-					case '0':
-						this.payWay = 'WEIXIN'
-						this.btnColor='#09BB07'
-						this.buttonText = '去支付'
-						break
-					case '1':
-						this.payWay = 'UNIONPAY'
-						this.btnColor='#034582'
-						this.buttonText = '生成企业网银支付链接'
-						break
-					case '2':
-						this.payWay = 'UNIONPAY'
-						this.btnColor='#034582'
-						this.buttonText = '生成个人网银支付链接'
-						break
-				}
-				this.GetPayOrderInfo()
-			},
-			GetPayOrderInfo(){//初始化支付信息
-				this.PayService.PayOrderCheckoutShoporders({shopOrderId:this.shopOrderId}).then(response =>{
-					let data = response.data
-					this.discernReceipt = data.discernReceipt 	// 支付记录
-					this.shopOrderInfo = data.shopOrder  	// 子订单
-					this.obligation = data.shopOrder.obligation  	// 待付金额
-					this.orderId = data.shopOrder.orderId  	// 主订单Id
-					this.receiptAmount = data.shopOrder.receiptAmount  	// 已付金额
-					this.payableAmount = data.shopOrder.realPay // 应付金额
-					this.payAmount = this.toFixedFn(this.obligation)		// 自定义金额
-					this.balanceAmount = this.obligation - this.payAmount	// 计算剩余支付金额
-					this.isRepuest = true
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000)
-				})
-			},
-			buttonSubMit(){
-				switch(this.payType){
-					case '0':// 微信支付
-						// 友盟埋点收集微信支付
-						if(process.env.NODE_ENV != 'development'){
-							this.$uma.trackEvent('Um_Event_ConfirmWechatPay', {
-								Um_Key_PageName: '微信支付',
-								Um_Key_SourcePage: '线上支付',
-								Um_Key_PayName:`${this.buttonText}`,
-								Um_Key_PayOrderID:`${this.shopOrderId}`
-							})
-						}
-						this.MiniWxPayFor()
-						break
-					case '1':// 企业网银
-						// 友盟埋点收集企业网银
-						if(process.env.NODE_ENV != 'development'){
-							this.$uma.trackEvent('Um_Event_ConfirmEbankPay', {
-								Um_Key_PageName: '企业网银',
-								Um_Key_SourcePage: '线上支付',
-								Um_Key_PayName:`${this.buttonText}`,
-								Um_Key_PayOrderID:`${this.shopOrderId}`
-							})
-						}
-						this.BuildCatenate()
-						break
-					case '2':// 个人网银
-						// 友盟埋点收集个人网银
-						if(process.env.NODE_ENV != 'development'){
-							this.$uma.trackEvent('Um_Event_ConfirmAbankPay', {
-								Um_Key_PageName: '个人网银',
-								Um_Key_SourcePage: '线上支付',
-								Um_Key_PayName:`${this.buttonText}`,
-								Um_Key_PayOrderID:`${this.shopOrderId}`
-							})
-						}
-						this.BuildCatenate()
-						break
-				}
-			},
-			BuildCatenate(){// 企业网银  个人网银
-				if(this.payAmount == 0){
-					this.$util.msg('请输入本次支付的金额',2000)
-					return
-				}
-				if(this.payAmount <=10){
-					this.$util.msg('网银支付的金额必须大于￥10.00',2000)
-					return
-				}
-				if( this.payType == '1'){
-					if(this.payAmount != this.payableAmount){
-						this.contentModalText = '企业网银支付每次收取的手续费较高，建议一次性全额付款。'
-						this.modal = true
-						return
-					}
-				}
-				this.PayService.PayOrderPayLink({unpaidAmount:this.payAmount,shopOrderId:this.shopOrderId,payType:this.payType}).then(response =>{
-					this.payHttpUrl = response.data
-					this.isShowTip = true
-				})
-			},
-			async MiniWxPayFor(){// 微信支付
-				if(this.payAmount > 5000){
-					this.modal = true
-					return
-				}
-				if(this.payAmount == 0){
-					this.$util.msg('请输入本次支付的金额',2000)
-					return
-				}
-				if(this.payAmount*100 < 2){
-					this.$util.msg('本次支付的金额必须大于￥0.02',2000)
-					return
-				}
-				// 获取微信code
-				const wechatCode = await authorize.getCode('weixin')
-				const params = {
-						payAmount:this.payAmount,
-						payType:'XCX',
-						code:wechatCode,
-						shopOrderId:this.shopOrderId
-				}
-				this.weChatMiniOrderWxPay(params)
-			},
-			handleClick(){
-				this.modal = false
-			},
-			confirmEvent(value){//点击自定义键盘完成的回调函数
-				this.chechValue(value)
-				this.showDigitKeyboard = false
-			},
-			blurInput(e){
-				this.chechValue(e.detail.value)
-			},
-			focusInput(){
-				// this.showDigitKeyboard = true
-			},
-			hideKeyboard(){
-				this.showDigitKeyboard = false
-			},
-			chechValue(value){
-				let patern = /\d+\.\d+/g
-				if(value && value.split('.').length > 2) {
-					value= patern.exec(value)
-				}
-				if(value == '' || value <0 ){
-					this.payAmount = ''
-					this.balanceAmount = this.obligation
-				}else if( value > this.obligation){
-					this.payAmount = this.toFixedFn(this.obligation)
-					this.balanceAmount = this.toFixedFn(this.obligation - this.payAmount)
-				}else{
-					this.payAmount = this.toFixedFn(value)
-					this.balanceAmount = this.toFixedFn(this.obligation - this.payAmount)
-				}
-			},
-			hanldNavigateBack(){//页面返回
-				uni.navigateBack({
-					delta: 1
-				})
-			},
-			payTypeText (state){//处理支付记录文字
-				let stateText = '',
-					stateTextObject={
-						12:'企业网银',
-						13:'微信支付',
-						14:'支付宝',
-						15:'微信支付',
-						16:'余额抵扣',
-					}
-				Object.keys(stateTextObject).forEach(key => {
-					if(key == state){
-						stateText = stateTextObject[key]
-					}
-				})
-				return stateText
-			},
-			
-			hideTips(){//隐藏弹窗
-				this.isShowTip = false
-			},
-			toFixedFn(text){//处理小数点后两位数
-				return Number(text).toFixed(2)
-			},
-			copyClipboard(data){
-				//复制账号
-				thorui.getClipboardData(data, (res) => {
-					if (res) {
-						this.$util.msg('已复制',2000)
-					} else {
-						this.$util.msg('复制失败',2000)
-					}
-				})
-			},
-			clipboard(data) {//复制链接
-				console.log('data',data)
-				thorui.getClipboardData(data, (res) => {
-					if (res) {
-						this.isShowTip = false
-						this.$util.msg('已复制',2000)
-						// 友盟埋点收集复制网银链接
-						if(process.env.NODE_ENV != 'development'){
-							this.$uma.trackEvent('Um_Event_CopyUnionPay', {
-								Um_Key_PageName: '网银支付',
-								Um_Key_SourcePage: '线上支付',
-								Um_Key_PayName:`${this.buttonText}`,
-								Um_Key_PayOrderID:`${this.shopOrderId}`
-							})
-						}
-					} else {
-						this.$util.msg('复制失败',2000)
-					}
-				})
-			},
-			discard(){
-				//丢弃
-			}
-		},
-		onShow() {
-
-		}
-	}
-</script>
-
-<style lang="scss">
-	page{height: auto !important;background-color: #FFFFFF;}
-	.container-cash{
-		width: 100%;
-		.container-wrapper{
-			width:100%;
-			margin: 0 auto;
-			.pay-content{
-				width: 662rpx;
-				height: 420rpx;
-				padding: 64rpx 44rpx 0 44rpx;
-				border-radius: 0 0 60rpx 60rpx;
-				background: url(https://img.caimei365.com/group1/M00/03/BD/Cmis218elN6AY6VeAAqw4n3n4nw186.png) no-repeat;
-				background-size: cover;
-				float: left;
-				position: relative;
-				.pay-top{
-					width: 100%;
-					height: auto;
-					float: left;
-					margin-bottom: 44rpx;
-					.pay-paid{
-						width: 100%;
-						height: auto;
-						margin-bottom: 38rpx;
-						text{
-							line-height: 48rpx;
-							text-align: left;
-							color: #FFFFFF;
-							width: 100%;
-						}
-						.txt-m{
-							font-size: $font-size-26;
-							opacity: 0.7;
-							display: inline-block;
-						}
-						.txt-b{
-							font-size: $font-size-48;
-							display: inline-block;
-							.small{
-								font-size: $font-size-32;
-							}
-						}
-					}
-					.pay-payd{
-						width: 100%;
-						height: auto;
-						.pay-paids{
-							height: auto;
-							float: left;
-							margin-right: 48rpx;
-							text{
-								line-height: 48rpx;
-								text-align: left;
-								color: #FFFFFF;
-							}
-							.txt-m{
-								width: 100%;
-								display: inline-block;
-								font-size: $font-size-26;
-								opacity: 0.7;
-							}
-							.txt-b{
-								width: 100%;
-								display: inline-block;
-								font-size: $font-size-32;
-							}
-						}
-					}
-				}
-				.pay-bot{
-					width: 614rpx;
-					height: 184rpx;
-					padding: 24rpx;
-					background: #FFFFFF;
-					border-radius: 28rpx;
-					box-shadow:0 2px 6px rgba(255, 77, 0, .17);
-					position: absolute;
-					bottom: -92rpx;
-					left:44rpx;
-					.bot-title{
-						line-height: 36rpx;
-						font-size: $font-size-26;
-						color: #666666;
-					}
-					.bot-input{
-						width: 100%;
-						height: 66rpx;
-						margin: 15rpx 0;
-						border-bottom: 1px solid #EBEBEB;
-						line-height: 66rpx;
-						font-size: $font-size-32;
-						color: $text-color;
-						text{
-							display: block;
-							float: left;
-						}
-						.input{
-							font-size: $font-size-40;
-							width: 500rpx;
-							height: 66rpx;
-							padding: 0 10rpx;
-							line-height: 66rpx;
-							float: left;
-							.none{
-								color:$text-color;
-								opacity: 0.3;
-							}
-							.text{
-								color:$text-color;
-							}
-						}
-						.placeholder{
-							font-size: $font-size-26;
-						}
-					}
-					.bot-resid{
-						line-height: 36rpx;
-						font-size: $font-size-26;
-						margin-top: 24rpx;
-						.bot-resid-le{
-							display: inline-block;
-							float: left;
-							color: $color-system;
-						}
-						.bot-resid-ri{
-							display: inline-block;
-							float: right;
-							color: #1890F9;
-							.icon-xiangyou{
-								margin-left: 5rpx;
-							}
-						}
-					}
-				}
-			}
-			.pay-record{
-				float: left;
-				background: #FFFFFF;
-				width: 702rpx;
-				height: auto;
-				padding: 0 24rpx;
-				margin-top: 112rpx;
-				.record-title{
-					width: 100%;
-					float: left;
-					font-size: $font-size-28;
-					color: $text-color;
-					line-height: 80rpx;
-					height: 80rpx;
-					border-bottom: 1px solid #F8F8F8;
-				}
-				.record-list{
-					width: 100%;
-					height: auto;
-					float: left;
-					.list-none{
-						line-height: 80rpx;
-						font-size: $font-size-26;
-						color: #999999;
-						text-align: left;
-					}
-					.list-main{
-						height: auto;
-						display: flex;
-						flex-direction:column;
-						.list-item{
-							width: 100%;
-							height:80rpx;
-							display: flex;
-							flex: 1;
-							line-height: 80rpx;
-							font-size: $font-size-26;
-							color: $text-color;
-							.text{
-								&.row-1{
-									flex: 3;
-								}
-								&.row-2{
-									flex: 3;
-								}
-								&.row-3{
-									flex: 4;
-									text-align: right;
-									color: #999999;
-								}
-							}
-						}
-					}
-				}
-			}
-		}
-		.pay-button{
-			width: 100%;
-			background-color: #FFFFFF;
-			position: fixed;
-			height: 88rpx;
-			padding-top: 24rpx;
-			bottom: 0;
-			.btn{
-				width: 702rpx;
-				height: 88rpx;
-				border-radius: 44rpx;
-				font-size: $font-size-28;
-				line-height: 88rpx;
-				color: #FFFFFF;
-				margin: 0 auto;
-				text-align: center;
-				background: $btn-confirm;
-			}
-		}
-	}
-	.freight-alert{
-		width: 100%;
-		height: 100%;
-		background: rgba(0,0,0,.5);
-		position: fixed;
-		top: 0;
-		left: 0;
-		z-index: 8888;
-		transition: all 0.4s;
-		&.none{
-			display: none;
-		}
-		&.show{
-			display: block;
-		}
-		.content{
-			width: 422rpx;
-			height:434rpx;
-			position: absolute;
-			background: $bg-color;
-			left: 0;
-			right: 0;
-			bottom: 0;
-			top: 0;
-			margin: auto;
-			padding: 20rpx 32rpx;
-			border-radius: 12rpx;
-			.title{
-				width: 100%;
-				height: 68rpx;
-				line-height: 68rpx;
-				font-size: $font-size-28;
-				color: $text-color;
-				text-align: center;
-				position: relative;
-				.icon-iconfontguanbi{
-					width: 68rpx;
-					height: 68rpx;
-					text-align: center;
-					line-height: 68rpx;
-					position: absolute;
-					right: 0;
-					top: 0;
-					font-size: $font-size-36;
-					color: #999999;
-				}
-			}
-			.text-content{
-				width: 100%;
-				height: auto;
-				.text{
-					padding: 20rpx 0 0 0;
-					line-height: 44rpx;
-					font-size: $font-size-26;
-					color:#666666;
-					text-align: justify;
-				}
-				.text-p{
-					width: 100%;
-					line-height: 44rpx;
-					font-size: $font-size-26;
-					color:$color-system;
-					text-align: left;
-					text-overflow:ellipsis;
-					display: -webkit-box;
-					word-break: break-all;
-					-webkit-box-orient: vertical;
-					-webkit-line-clamp: 1;
-					overflow: hidden;
-				} 
-				.text-b{
-					line-height: 44rpx;
-					font-size: $font-size-24;
-					color:#999999;
-					text-align: left;
-				}
-			}
-			.text-button{
-				width: 100%;
-				height: 88rpx;
-				line-height: 88rpx;
-				background: $btn-confirm;
-				font-size: $font-size-28;
-				border-radius: 44rpx;
-				color:#FFFFFF;
-				text-align: center;
-				margin-top: 20rpx;
-			}
-		}
-	}
-	.tui-prompt-title{
-		width: 100%;
-		height: 44rpx;
-		line-height: 44rpx;
-		padding: 20rpx 0;
-		text-align: center;
-		color: #333333;
-		border-bottom: 1px solid #E2E7EF;
-	}
-	.tui-prompt-text{
-		padding-top: 20rpx;
-		.tui-prompt-tips{
-			width: 100%;
-			line-height: 36rpx;
-			font-size: $font-size-22;
-			color: #F3B574;
-			text-align: justify;
-			margin-bottom: 24rpx;
-		}
-		.tui-prompt-item{
-			width: 100%;
-			line-height: 60rpx;
-			color: #333333;
-			font-size: $font-size-26;
-			.text{
-				font-weight: bold;
-			}
-			.copy{
-				height: 38rpx;
-				box-sizing: border-box;
-				padding: 0 24rpx;
-				text-align: center;
-				line-height: 36rpx;
-				display: inline-block;
-				.iconfont{
-					font-size: $font-size-40;
-					color: #666666;
-				}
-			}
-		}	
-	}
-	.tui-prompt-flex{
-		width: 100%;
-		height: auto;
-		margin-top: 20rpx;
-		box-sizing: border-box;
-		padding: 0 35rpx;
-		.btn{
-			width: 100%;
-			line-height: 84rpx;
-			font-size: $font-size-26;
-			text-align: center;
-			color: #FFFFFF;
-			border-radius: 44rpx;
-			margin: 20rpx 0;
-			&.btn-cancel{
-				background: #FFFFFF;
-				color: #333333;
-				border: 1px solid #979797;
-			}
-			&.btn-confirm{
-				background: $btn-confirm;
-			}
-		}
-		
-	}
-</style>

pages/user/order/order-sharelogin.vue

@@ -34,7 +34,6 @@ export default {
 	data() {
 		return {
 			isIphoneX: this.$store.state.isIphoneX,
-			imagePath: 'https://img.caimei365.com/group1/M00/03/83/Cmis214FbbCAQhKoAAKWfqqSIds292.png',
 			shareCode: '', //获取用户登录的邀请码
 			isUserInfo: false, //控制显示授权弹窗
 			isShareStatus: false,

pages/user/order/orderShareLogin.vue

@@ -1,7 +1,7 @@
  <template>
 	<view class="container login">
 		<view class="login-main">
-			<image class="logo" :src="imagePath" mode=""></image>
+			<image class="logo" :src="staticUrl+'icon_share_login@2x.png'" mode=""></image>
 		</view>
 		<view class="login-input">
 			<input type="number" 
@@ -19,7 +19,7 @@
 	export default{
 		data() {
 			return{
-				imagePath:'https://img.caimei365.com/group1/M00/03/83/Cmis214FbbCAQhKoAAKWfqqSIds292.png',
+				staticUrl:this.global.staticUrl,
 				shareCode:'',  		// 获取用户登录的邀请码
 				isUserInfo:false,	// 控制显示授权弹窗
 				params:{
@@ -88,8 +88,8 @@
 			align-items: center;
 			padding: 128rpx 0;
 			.logo{
-				width: 658rpx;
-				height: 354rpx;
+				width: 460rpx;
+				height: 300rpx;
 				display: block;
 			}
 		}

services/beautyArchive.service.js

@@ -1,39 +0,0 @@
-/**
- * 这是商品资料库相关的业务逻辑的服务
- */
-export default class BeautyArchiveService {
-    constructor(AjaxService) {
-        Object.assign(this, { AjaxService })
-        this.name = 'BeautyArchiveService'
-    }
-
-    /* 获取资料库商品列表 */
-    GetArchiveProduct(data = {}) {
-        return this.AjaxService.get({
-            url: '/commodity/product/archive',
-            data,
-            isLoading: true,
-              
-        })
-    }
-
-    /* 获取商品资料列表 */
-    GetProdcutArchiveDetails(data = {}) {
-        return this.AjaxService.get({
-            url: '/commodity/product/archive/detail',
-            data,
-            isLoading: false,
-              
-        })
-    }
-
-    /* 采美豆抵扣 */
-    SearchArchiveByBeans(data = {}) {
-        return this.AjaxService.post({
-            url: '/user/club/archive/deduction',
-            data,
-            isLoading: true,
-              
-        })
-    }
-}

services/common.service.js

@@ -6,12 +6,12 @@ export default class CommonService {
         Object.assign(this, { AjaxService })
         this.name = 'CommonService'
     }
-    /* 首页导航模块商品列表 */
-    GetHomeClassify(data = {}) {
+    /* 首页初始化 */
+    mallOrganizeHome(data = {}) {
         return this.AjaxService.get({
-            url: '/home/classify',
+            url: '/commodity/MallOrganize/mall/init',
             data,
-            isLoading: true,
+            isLoading: false,
         })
     }
     /* 首页初始化 */

services/config.env.js

@@ -3,8 +3,8 @@ if(process.env.NODE_ENV === 'development'){
     // 开发环境
     // URL_CONFIG = 'http://192.168.2.67:18002'	 //智捷联调地址
     // URL_CONFIG = 'http://192.168.2.68:18002'	 //涛涛联调地址
-    // URL_CONFIG = 'http://192.168.2.102:18002' //志国联调地址
-    URL_CONFIG = 'https://core-b.caimei365.com'
+    URL_CONFIG = 'http://192.168.2.102:18002' //志国联调地址
+    // URL_CONFIG = 'https://core-b.caimei365.com'
     // URL_CONFIG = 'https://core.caimei365.com'  
 }else{
     // 生产环境

services/index.js

@@ -4,45 +4,27 @@ import ajaxService from './ajax.service.js'
 import CommonService from './common.service'
 import UserService from './user.service'
 import ProductService from './product.service'
-import ShopService from './shop.service'
 import PayService from './pay.service'
-import SellerService from './sellse.service'
 import ActivityService from './activity.service'
 import OrderService from './order.service'
-import SecondService from './second.service'
 import PublicService from './public.service.js'
-import OtherService from './other.service.js'
 import UploadService from './upload.service.js'
-import BeautyArchive from './beautyArchive.service.js'
-import LibraryService from './library.service.js'
 
 let commonService = new CommonService(ajaxService)
 let userService = new UserService(ajaxService)
 let productService = new ProductService(ajaxService)
-let shopService = new ShopService(ajaxService)
 let payService = new PayService(ajaxService)
-let sellerService = new SellerService(ajaxService)
 let activityService = new ActivityService(ajaxService)
 let orderService = new OrderService(ajaxService)
-let secondService = new SecondService(ajaxService)
 let publicService = new PublicService(ajaxService)
-let otherService = new OtherService(ajaxService)
 let uploadService = new UploadService(ajaxService)
-let beautyArchive = new BeautyArchive(ajaxService)
-let libraryService = new LibraryService(ajaxService)
 
 Vue.prototype.AjaxService = ajaxService
 Vue.prototype.CommonService = commonService
 Vue.prototype.UserService = userService
 Vue.prototype.ProductService = productService
-Vue.prototype.ShopService = shopService
 Vue.prototype.PayService = payService
-Vue.prototype.SellerService = sellerService
 Vue.prototype.ActivityService = activityService
 Vue.prototype.OrderService = orderService
-Vue.prototype.SecondService = secondService
 Vue.prototype.PublicService = publicService
-Vue.prototype.OtherService = otherService
 Vue.prototype.UploadService = uploadService
-Vue.prototype.BeautyArchive = beautyArchive
-Vue.prototype.LibraryService = libraryService

services/library.service.js

@@ -1,42 +0,0 @@
-export default class LibraryService {
-    constructor(AjaxService) {
-        Object.assign(this, { AjaxService })
-        this.name = 'LibraryService'
-    }
-
-    // 美业资料列表
-    GetProductArchive(data = {}) {
-        return this.AjaxService.get({
-            url: '/commodity/product/archive',
-            data,
-            isLoading: true,
-        })
-    }
-
-    // 采美文章列表
-    GetArticleList(data = {}) {
-        return this.AjaxService.get({
-            url: '/commodity/search/query/article',
-            data,
-            isLoading: true
-        })
-    }
-
-    // 采美百科列表
-    GetEncyclopediaList(data = {}) {
-        return this.AjaxService.get({
-            url: '/commodity/search/query/baike/keyword',
-            data,
-            isLoading: true 
-        })
-    }
-
-    // 获取关键词库关键词列表
-    GetSearchKeywordList(data = {}) {
-        return this.AjaxService.post({
-            url: '/commodity/search/query/get/keyword/list',
-            data,
-            isLoading: false
-        })
-    }
-}

services/order.service.js

@@ -11,8 +11,7 @@ export default class OrderService {
         return this.AjaxService.get({ 
             url:'/order/club/list', 
             data, 
-            isLoading: true ,
-              
+            isLoading: false ,
         })
     }
     /* 查询订单详情 */

services/other.service.js

@@ -1,26 +0,0 @@
-/**
- * 条款服务业务逻辑的服务
- */
-export default class OtherService {
-	constructor(AjaxService) {
-		Object.assign(this, { AjaxService })
-		this.name = 'OtherService'
-	}
-	/**
-	 * 售后条款
-	 */
-	QuerySaveClause (data) {
-		return this.AjaxService.get({ 
-			url:'/order/club/clause', 
-			data, 
-			isLoading: true ,
-			  
-		})
-	}
-	/**
-	 * 协议
-	 */
-	QueryClubProtocol (data) {
-		return this.AjaxService.get({ url:'/user/center/protocol', data, isLoading: true })
-	}
-}

services/public.service.js

@@ -2,56 +2,55 @@
  * 这是所有模块公用业务逻辑的服务
  */
 export default class PublicService {
-	constructor(AjaxService) {
-		Object.assign(this, { AjaxService })
-		this.name = 'PublicService'
-	}
-	/**
+    constructor(AjaxService) {
+        Object.assign(this, { AjaxService })
+        this.name = 'PublicService'
+    }
+    /**
 	 * 获取地址
 	 */
-	GetAllAddressData (data = {}) {
-		return this.AjaxService.get({ 
-			url:'/order/address/select/all', 
-			data, 
-			isLoading: false ,
-			  
-		})
-	}
-	/**
+    GetAllAddressData (data = {}) {
+        return this.AjaxService.get({ 
+            url:'/order/address/select/all', 
+            data, 
+            isLoading: false ,
+        })
+    }
+    /**
 	 * 获取图形验证码
 	 * platformType:小程序 2  WWW 0  CRM 1 
 	 */
-	GetImgVerifyCode (data = {platformType:2}) {
-		return this.AjaxService.get({ 
-			url:'/user/captcha', 
-			data, 
-			isLoading: true,
+    GetImgVerifyCode (data = {platformType:2}) {
+        return this.AjaxService.get({ 
+            url:'/user/captcha', 
+            data, 
+            isLoading: true,
 			  
-		})
-	}
-	/**
+        })
+    }
+    /**
 	 * 获取图形验证码
 	 * activateCodeType:机构 2  供应商 3 找回密码 1 
 	 */
-	GetMobileCode (data = {}) {
-		return this.AjaxService.get({ 
-			url:'/user/activateCodeByReg', 
-			data, 
-			isLoading: true 
-		})
-	}
-	/**
+    GetMobileCode (data = {}) {
+        return this.AjaxService.get({ 
+            url:'/user/activateCodeByReg', 
+            data, 
+            isLoading: true 
+        })
+    }
+    /**
 	 * 获取图形验证码
 	 * activateCodeType:机构 2  供应商 3 找回密码 1 
 	 */
-	GetMobileCode (data = {}) {
-		return this.AjaxService.get({ 
-			url:'/user/activateCodeByReg', 
-			data, 
-			isLoading: true 
-		})
-	}
-	/**
+    GetMobileCode (data = {}) {
+        return this.AjaxService.get({ 
+            url:'/user/activateCodeByReg', 
+            data, 
+            isLoading: true 
+        })
+    }
+    /**
 	 * 获取手机短信验证码
 	 * isCheckCaptcha 	是否需要图形验证码：1:不检查 , 0：检查
 	 * mobile			手机号
@@ -60,28 +59,28 @@ export default class PublicService {
 	 * token            图片验证码token
 	 * platformType: 	来源：0:www，1:crm/h5，2:小程序
 	 */
-	GetRegisterMobileCode (data = {}) {
-		return this.AjaxService.get({ 
-			url:'/user/sms/code', 
-			data, 
-			isLoading: true,
+    GetRegisterMobileCode (data = {}) {
+        return this.AjaxService.get({ 
+            url:'/user/sms/code', 
+            data, 
+            isLoading: true,
 			  
-		})
-	}
-	/**
+        })
+    }
+    /**
 	 * 获取邮箱短信验证码
 	 * email 	邮箱
 	 * status	1:绑定邮箱,2邮箱注册,3邮箱找回秘密
 	 */
-	GetUserEmailCode (data = {}) {
-		return this.AjaxService.get({ 
-			url:'/user/mail/code', 
-			data, 
-			isLoading: true,
+    GetUserEmailCode (data = {}) {
+        return this.AjaxService.get({ 
+            url:'/user/mail/code', 
+            data, 
+            isLoading: true,
 			  
-		})
-	}
-	/**
+        })
+    }
+    /**
 	 * 获取手机短信验证码
 	 * bindMobile 		机构手机号
 	 * isCheckCaptcha 	是否需要图形验证码：1:检查 , 0：不检查z
@@ -91,12 +90,12 @@ export default class PublicService {
 	 * token            图片验证码token
 	 * platformType: 	来源：0:www，1:crm/h5，2:小程序
 	 */
-	GetBindMobileCode (data = {}) {
-		return this.AjaxService.get({ 
-			url:'/user/sms/bind', 
-			data, 
-			isLoading: true,
+    GetBindMobileCode (data = {}) {
+        return this.AjaxService.get({ 
+            url:'/user/sms/bind', 
+            data, 
+            isLoading: true,
 			  
-		})
-	}
+        })
+    }
 }	

services/second.service.js

@@ -1,58 +0,0 @@
-// 二手商品
-export default class SecondService {
-    constructor(AjaxService) {
-        Object.assign(this, { AjaxService })
-        this.name = 'SecondService'
-    }
-    /**
-	 *二手商品列表
-	 *@param 二手商品分类 secondHandType	1二手仪器，2临期产品，3其他  【必传】
-	 *@param 二手仪器分类的类型 instrumentType	1轻光电、2重光电、3耗材配件【不传默认全部】
-	 *@param 搜索关键词 searchKeyword	【选传】 
-	 */
-    SeconHandProductList (data = {}) {
-        return this.AjaxService.get({ 
-            url:'/commodity/second/list', 
-            data, 
-            isLoading: true ,
-			  
-        })
-    }
-    /*二手发布/品牌列表 */
-    brandList (data = {}) {
-        return this.AjaxService.get({ 
-            url:'/commodity/second/brands', 
-            data, 
-            isLoading: false ,
-        })
-    }
-    /*二手发布/提交发布 */
-    SecondHandProduct (data = {}) {
-        return this.AjaxService.post({ 
-            url:'/commodity/second/release', 
-            data, 
-            isLoading: true ,
-			  
-        })
-    }
-    /*二手发布/浏览量 */
-    ProductCount (data = {}) {
-        return this.AjaxService.get({ 
-            url:'/product/updateSecondHandProductCount', 
-            data, 
-            isLoading: true ,
-        })
-    }
-    /**
-	 *@二手商品详情
-	 *@param productId：商品ID（数字类型，必传）
-	 */
-    ProductDetail (data={}){//商品详情
-        return this.AjaxService.get({ 
-            url:'/commodity/second/detail', 
-            data, 
-            isLoading: true ,
-			  
-        })
-    }
-}

services/sellse.service.js

@@ -1,383 +0,0 @@
-/**
- * explain: 这是协销用户业务的服务
- * Author: zhjy
- * Time: 2020-09-24
- */
-export default class SellerService {
-    constructor(AjaxService) {
-        Object.assign(this, { AjaxService })
-        this.name = 'SellerService'
-    }
-    /**
-	 *@协销登录
-	 *@param mobile 手机号
-	 *@param password 密码
-	 */
-    SellerLogin (data={}){
-        return this.AjaxService.post({ 
-            url:'/user/login/seller', 
-            data, 
-            isLoading: true ,
-              
-        })
-    }
-    /**
-	 *@协销账户中心
-	 *@param userID 协销ID
-	 */
-    GetSellerHome (data = {}) {
-        return this.AjaxService.get({ url:'/user/seller/home', data, isLoading: true })
-    }
-    /**
-	 *@协销拉机构上线(资料填写)
-	 *@param userID 协销ID
-	 */
-    SellerClubTemporary (data={}){
-        return this.AjaxService.post({ 
-            url:'/user/register/club/temporary', 
-            data, 
-            isLoading: true ,
-              
-        })
-    }
-    /**
-	 *@协销拉机构上线
-	 *@param userID 协销ID
-	 */
-    SellerClubRegister (data={}){
-        return this.AjaxService.post({ 
-            url:'/user/register/club/online', 
-            data, 
-            isLoading: true ,
-              
-        })
-    }
-    /**
-	 *@协销拉机构上线检测手机号和邮箱
-	 *@param mobileOrEmail 手机号和邮箱
-	 */
-    SellerClubCheck (data={}){
-        return this.AjaxService.get({ 
-            url:'/user/register/check', 
-            data, 
-            isLoading: true,
-              
-        })
-    }
-    /**
-	 *@协销机构列表
-	 *@param name 	  机构名字关键字（搜索用）
-	 *@param pageNum  页码
-	 *@param pageSize 条数
-	 *@param spId 	  协销ID
-	 *@param status   机构状态
-	 */
-    GetSellerClubList (data = {}) {
-        return this.AjaxService.get({ 
-            url:'/user/seller/club/list', 
-            data, 
-            isLoading: false ,
-              
-        })
-    }
-    /**
-     *@协销机构列表
-     *@param serviceProviderId 协销ID
-     *@param pageNum  页码
-     *@param pageSize 条数
-     */
-    GetOrderCount (data = {}) {
-        return this.AjaxService.get({ 
-            url:'/order/seller/count', 
-            data, 
-            isLoading: true ,
-        })
-    }
-    /**
-	 *@协销机构列表
-	 *@param name 	  机构名字关键字（搜索用）
-	 *@param pageNum  页码
-	 *@param pageSize 条数
-	 */
-    GetFindAllClubList (data = {}) {
-        return this.AjaxService.get({ 
-            url:'/user/seller/club/all', 
-            data, 
-            isLoading: true ,
-        })
-    }
-    /**
-	 *@查询行为记录链接信息
-	 *@param clubId 
-	 */
-    userClubRecordLinkage (data = {}) {
-        return this.AjaxService.get({ 
-            url:'/user/club/recordLinkage', 
-            data, 
-            isLoading: false ,
-        })
-    }
-    /**
-	 *@协销订单列表（搜索订单）
-	 *@param listType 订单类型
-	 *@param orderNo  订单号
-	 *@param pageNum  页码
-	 *@param pageSize 条数
-	 *@param serviceProviderId 协销ID
-	 */
-    GetSellerOrderList (data = {}) {
-        return this.AjaxService.get({ 
-            url:'/order/seller/list', 
-            data, 
-            isLoading: true ,
-              
-        })
-    }
-    /**
-	 *@协销下机构订单列表
-	 *@param clubID   机构ID
-	 *@param pageNum  页码
-	 *@param pageSize 条数
-	 */
-    GetSellerClubOrderList (data = {}) {
-        return this.AjaxService.get({ 
-            url:'/order/seller/list/club', 
-            data, 
-            isLoading: true ,
-              
-        })
-    }
-    /**
-	 *@协销-关键词搜索订单
-	 *@param  userId：商品ID（数字类型，必传）
-	 *@param pageNum：机构会所ID(同之前)
-	 *@param pageSize：协销ID(同之前)
-	 */
-    getSellerOrderList (data={}){
-        return this.AjaxService.get({ 
-            url:'/order/seller/search', 
-            data, 
-            isLoading: true ,
-              
-        })
-    }
-    // 协销订单列表/再来一单
-    SellerCreateOrderAgain (data = {}) {
-        return this.AjaxService.post({ 
-            url:'/order/seller/cart/again', 
-            data, 
-            isLoading: true ,
-              
-        })
-    }
-    /**
-	 *@协销-二手下单商品列表
-	 *@param 二手商品分类 secondHandType	1二手仪器，2临期产品，3其他  【必传】
-	 *@param 二手仪器分类的类型 instrumentType	1轻光电、2重光电、3耗材配件【不传默认全部】
-	 *@param 搜索关键词 searchKeyword	【选传】 
-	 */
-    GetOrderSecondHandProductList (data = {}) {
-        return this.AjaxService.get({ 
-            url:'/commodity/second/order/products', 
-            data, 
-            isLoading: true ,
-              
-        })
-    }
-    /**
-	 *@协销-二手去结算接口
-	 *@param productId：商品ID（数字类型，必传）
-	 *@param clubId：机构会所ID(同之前)
-	 *@param serviceProviderId：协销ID(同之前)
-	 *@param productCount:二手购买数量 
-	 */
-    GetSettlementBySencondProduct (data = {}) {
-        return this.AjaxService.get({ 
-            url:'/order/seller/second/settlement', 
-            data, 
-            isLoading: true ,
-              
-        })
-    }
-	
-    /**
-	 *@协销-二手商品推荐
-	 *@param productId：商品ID（数字类型，必传）
-	 */
-    ProductRecommend (data={}){//相关推荐
-        return this.AjaxService.get({ url:'/commodity/second/recommend', data, isLoading: true })
-    }
-    /*协销下单购物车->api*/
-    /**
-	 *@单一商品加入购物车
-	 *@param clubId 会所的ID
-	 *@param serviceProviderId 协销ID
-	 */
-    ShoppingCartAddCart (data = {}) {
-        return this.AjaxService.post({ 
-            url:'/order/seller/cart/add', 
-            data, 
-            isLoading: true ,
-              
-        })
-    }
-    /*协销下单购物车->api*/
-    /**
-	 *@重选sku
-	 *@param clubId 会所的ID
-	 *@param serviceProviderId 协销ID
-	 */
-    orderSellerCkeckSku (data = {}) {
-        return this.AjaxService.post({ 
-            url:'/order/seller/check/sku', 
-            data, 
-            isLoading: true ,
-              
-        })
-    }
-    /**
-	 *@组合商品加入购物车
-	 *@param clubId 会所的ID
-	 *@param serviceProviderId 协销ID
-	 */
-    ShoppingCartBatchAddCart (data = {}) {
-        return this.AjaxService.post({ 
-            url:'/order/seller/cart/add', 
-            data, 
-            isLoading: true ,
-              
-        })
-    }
-    /**
-	 *@协销帮机构下单获取购物车数量
-	 *@param clubId 会所的ID
-	 *@param serviceProviderId 协销ID
-	 */
-    GetSellerProductNum (data = {}) {
-        return this.AjaxService.get({ 
-            url:'/order/seller/cart/count', 
-            data, 
-            isLoading: false ,
-              
-        })
-    }
-    /**
-	 *@协销帮机构下单购物车商品加减数量
-	 *@param clubId 机构的clubId
-	 *@param serviceProviderId 	协销ID
-	 */
-    SellerAddProductNum (data = {}) {
-        return this.AjaxService.post({ 
-            url:'/order/seller/cart/update', 
-            data, 
-            isLoading: true ,
-              
-        })
-    }
-    /**
-	 *@协销帮机构下单购物车删除商品
-	 *@param sellerCartIds 购物车ID
-	 */
-    sellerDeleteCart (data = {}) {
-        return this.AjaxService.post({ 
-            url:'/order/seller/cart/delete', 
-            data, 
-            isLoading: true ,
-              
-        })
-    }
-    /**
-	 *@协销帮机构下单获取购物车列表
-	 *@param clubId 会所的ID
-	 *@param serviceProviderId 协销ID
-	 */
-    GetSellerShoppingInfo (data = {}) {
-        return this.AjaxService.get({ 
-            url:'/order/seller/cart/list', 
-            data, 
-            isLoading: false ,
-              
-        })
-    }
-    /*协销下单订单->api*/
-    /**
-	 *@协销帮机构下单去结算初始化
-	 *@param clubId 机构ID
-	 *@param serviceProviderId 协销ID
-	 *@param productIds 商品ID
-	 */
-    SellerSettlement (data = {}) {
-        return this.AjaxService.get({ 
-            url:'/order/seller/cart/settlement', 
-            data, 
-            isLoading: true ,
-              
-        })
-    }
-    /**
-	 *@协销下定金商品订单初始化
-	 *@param productIds 商品ID
-	 */
-    SellerProductRechargeGoods (data = {}) {
-        return this.AjaxService.get({ 
-            url:'/commodity/recharge/details', 
-            data, 
-            isLoading: true ,
-        })
-    }
-    /**
-	 *@协销帮机构下定金商品订单提交
-	 *@param productIds 商品ID
-	 */
-    SellerSubmitRechargeOrder (data = {}) {
-        return this.AjaxService.post({ 
-            url:'/order/submit/recharge', 
-            data, 
-            isLoading: true,
-              
-        })
-    }
-    /**
-	 *@协销帮机构下单提交订单
-	 */
-    SellerCreateOrderSubmit (data = {}) {
-        return this.AjaxService.post({ 
-            url:'/order/submit/generate', 
-            data, 
-            isLoading: true ,
-              
-        })
-    }
-    /**
-	 *@获取可分配协销列表
-	 */
-    userClubChoseList (data = {}) {
-	    return this.AjaxService.get({ 
-	        url:'/user/club/chose/list', 
-	        data, 
-	        isLoading: false ,
-	    })
-    }
-    /**
-	 *@获取组员协销列表
-	 */
-    userSellerServiceTeam (data = {}) {
-	    return this.AjaxService.get({ 
-	        url:'/user/seller/service/team', 
-	        data, 
-	        isLoading: false ,
-	    })
-    }
-    /**
-	 *@分配协销
-	 */
-    userClubChoseSales (data = {}) {
-	    return this.AjaxService.post({ 
-	        url:'/user/club/chose/sales', 
-	        data, 
-	        isLoading: true ,
-	           
-	    })
-    }
-	
-}

services/shop.service.js

@@ -1,288 +0,0 @@
-/**
- * 这是与购物有关的业务逻辑的服务
- */
-export default class ShopService {
-    constructor(AjaxService) {
-        Object.assign(this, { AjaxService })
-        this.name = 'ShopService'
-    }
-    /* 小程序-供应商注册第一步 */
-    SupplierAppletsRegistered (data = {}) {
-        return this.AjaxService.post({ 
-            url:'/user/register/shop', 
-            data, 
-            isLoading: true,
-			  
-        })
-    }
-    /* 小程序-搜索供应商列表 */
-    GetSearchSupplierList (data = {}) {
-        return this.AjaxService.get({ 
-            url:'/commodity/search/query/shop', 
-            data, 
-            isLoading: true ,
-			  
-        })
-    }
-    /* 小程序供应商个人中心 */
-    GetHomePageData (data = {}) {
-        return this.AjaxService.get({ url:'/user/shop/personal/data', data, isLoading: true })
-    }
-    /* 小程序供应商我的商品 */
-    GetSupplierPyProduct (data = {}) {
-        return this.AjaxService.get({ 
-            url:'/commodity/shop/product/list', 
-            data, 
-            isLoading: false ,
-			  
-        })
-    }
-    /* 小程序供应商操作添加删除主推商品 */
-    SupplierSwitchFeaturedyProduct (data = {}) {
-        return this.AjaxService.post({ 
-            url:'/commodity/shop/featured/switch', 
-            data, 
-            isLoading: true ,
-			  
-        })
-    }
-    /* 小程序供应商操作下架商品 */
-    SupplierSoldOutProduct (data = {}) {
-        return this.AjaxService.post({ 
-            url:'/commodity/shop/product/offline', 
-            data, 
-            isLoading: true ,
-			  
-        })
-    }
-    /* 小程序供应商我的店铺详情 */
-    GetSupplierHomeDeatils (data = {}) {
-        return this.AjaxService.get({ 
-            url:'/user/shop/home/data', 
-            data, 
-            isLoading: true ,
-        })
-    }
-    /* 小程序供应商我的店铺banner */
-    GetSupplierHomeBanner (data = {}) {
-        return this.AjaxService.get({ 
-            url:'/user/shop/home/images', 
-            data, 
-            isLoading: true ,
-        })
-    }
-    /* 小程序供应商我的店铺主推商品 */
-    GetSupplierHomeProduct (data = {}) {
-        return this.AjaxService.get({ 
-            url:'/commodity/shop/product/main', 
-            data, 
-            isLoading: true ,
-			  
-        })
-    }
-    /* 小程序供应商我的店铺全部商品 */
-    GetSupplierHomeProductList (data = {}) {
-        return this.AjaxService.get({ 
-            url:'/commodity/search/query/product/shop', 
-            data, 
-            isLoading: false ,
-			  
-        })
-    }
-    /* 发货-添加商品资质初始化查询商品 */
-    GetSupplierLogisticsRecord (data = {}) {
-        return this.AjaxService.get({ 
-            url:'/order/shop/ship/logistics/record', 
-            data, 
-            isLoading: false ,
-			  
-        })
-    }
-    /* 发货-商品资质回显 */
-    GetSupplierQualificationData (data = {}) {
-        return this.AjaxService.get({ 
-            url:'/order/shop/qualification/list', 
-            data, 
-            isLoading: false ,
-			  
-        })
-    }
-    /* 发货-保存商品资质 */
-    GetSupplierQualificationUpdata (data = {}) {
-        return this.AjaxService.post({ 
-            url:'/order/shop/qualification/save', 
-            data, 
-            isLoading: false ,
-			  
-        })
-    }
-    /* 小程序供应商我的订单 */
-    GetSupplierMyOrderList (data = {}) {
-        return this.AjaxService.get({ 
-            url:'/order/shop/list', 
-            data, 
-            isLoading: true ,
-			  
-        })
-    }
-    /* 小程序发货-权限控制 */
-    MiniShipments (data = {}) {
-        return this.AjaxService.get({ 
-            url:'/order/shop/share/code/check', 
-            data, 
-            isLoading: true ,
-			  
-        })
-    }
-    /* 小程序发货-查询供应商子订单详情 */
-    GetShopOrderDetails (data = {}) {
-        return this.AjaxService.get({ 
-            url:'/order/shop/detail', 
-            data, 
-            isLoading: true ,
-			  
-        })
-    }
-    /* 小程序发货-供应商订单详情获取订单分享码 */
-    ShopOrderShareCode (data = {}) {
-        return this.AjaxService.get({ 
-            url:'/order/shop/share/code', 
-            data, 
-            isLoading: false ,
-			  
-        })
-    }
-    /* 小程序发货-供应商订单发货商品查询 */
-    ShopOrderShipmentsInfo (data = {}) {
-        return this.AjaxService.get({ 
-            url:'/order/shop/ship/info', 
-            data, 
-            isLoading: true ,
-			  
-        })
-    }
-    /* 小程序发货-物流公司查询 */
-    GetLogisticsCompany (data = {}) {
-        return this.AjaxService.get({ 
-            url:'/order/shop/ship/company', 
-            data, 
-            isLoading: true ,
-			  
-        })
-    }
-    /* 小程序发货-查看发货记录物流信息 */
-    GetLogisticsInfo (data = {}) {
-        return this.AjaxService.get({ 
-            url:'/order/shop/ship/logistics/info', 
-            data, 
-            isLoading: true ,
-			  
-        })
-    }
-    /* 小程序发货-查看发货记录-添加物流 */
-    ShopAddLogisticsInfo (data = {}) {
-        return this.AjaxService.post({ 
-            url:'/order/shop/ship/logistics/add', 
-            data, 
-            isLoading: true,
-			  
-        })
-    }
-    /* 小程序发货-扫码获取物流公司信息 */
-    GetExpressInformation (data = {}) {
-        return this.AjaxService.post({ 
-            url:'/order/shop/ship/logistics/scan', 
-            data, 
-            isLoading: false,
-			  
-        })
-    }
-    /* 小程序发货-确认发货 */
-    ShopAddLogistics (data = {}) {
-        return this.AjaxService.post({ 
-            url:'/order/shop/ship/delivery',
-			 data, 
-			 isLoading: true ,
-			   
-        })
-    }
-    /* 小程序发货-发货记录 */
-    ShopShipmentsRecord (data = {}) {
-        return this.AjaxService.get({ 
-            url:'/order/shop/ship/delivery/record', 
-            data, 
-            isLoading: true ,
-			  
-        })
-    }
-    /* 小程序发货-撤销发货 */
-    ShopCancelShipment (data = {}) {
-        return this.AjaxService.post({ 
-            url:'/order/shop/ship/delivery/cancel', 
-            data, 
-            isLoading: true ,
-			  
-        })
-    }
-    /* 一级分类 */
-    GetPrimaryClassification (data = {}) {
-        return this.AjaxService.get({ 
-            url:'/commodity/type/first',
-            data, 
-            isLoading: false ,
-        })
-    }
-    /* 二级级分类 */
-    GetPrimarySecondaryClassification (data = {}) {
-        return this.AjaxService.get({ 
-            url:'/supplier/secondaryClassification', 
-            data, 
-            isLoading: false ,
-        })
-    }
-    /* 三级分类 */
-    GetPrimaryThreeLevelClassification (data = {}) {
-        return this.AjaxService.get({ 
-            url:'/supplier/threeLevelClassification', 
-            data, 
-            isLoading: false ,
-        })
-    }
-    /**
-	 *@供应商消息通知中心未读消息数量
-	 */
-    getUserAuthShopMessageCount(data = {}) {
-	    return this.AjaxService.get({
-	        url: '/user/login/auth/shopMessageCount',
-	        data,
-	        isLoading: false,
-	    })
-    }
-    /**
-	 *@供应商消息通知列表
-	 *@param commonId：供应商shopId
-	 *@param messageType：消息类型1.交易物流2.账户通知3.服务通知4.优惠促销
-	 *@param pageNum	页码
-	 *@param pageSize	条数
-	 */
-    getUserAuthShopMessageList(data = {}) {
-	    return this.AjaxService.get({
-	        url: '/user/login/auth/shopMessageList',
-	        data,
-	        isLoading: false,
-	
-	    })
-    }
-    /**
-	 *@查询供应商未读消息数量
-	 *@param commonId：供应商clubId
-	 */
-    getAuthShopCount(data = {}) {
-        return this.AjaxService.get({
-            url: '/user/login/auth/ShopCount',
-            data,
-            isLoading: false,
-        })
-    }
-	
-}