From 877169ca988a7ec48ecdf5bde41932c3a8115251 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E4=B9=90?= <419641032@qq.com>
Date: Tue, 15 Sep 2020 18:24:23 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/src/views/order/orderDetail.vue         |   17 +-
 app/.gitignore                                |   24 -
 app/libs/wechat.js                            |    2 +-
 app/pages/index/index001.vue                  | 1917 -----------------
 app/pages/users/order_list/index.vue          |    2 +-
 app/utils/index.js                            |    2 +-
 .../front/service/impl/OrderServiceImpl.java  |    4 +-
 .../service/impl/StoreProductServiceImpl.java |    7 +-
 .../crmeb/store/utilService/OrderUtils.java   |    5 +-
 .../service/impl/SystemCityServiceImpl.java   |    1 -
 .../service/impl/SystemConfigServiceImpl.java |    1 -
 11 files changed, 23 insertions(+), 1959 deletions(-)
 delete mode 100644 app/.gitignore
 delete mode 100644 app/pages/index/index001.vue

diff --git a/admin/src/views/order/orderDetail.vue b/admin/src/views/order/orderDetail.vue
index 13b4d2ee..d1057037 100644
--- a/admin/src/views/order/orderDetail.vue
+++ b/admin/src/views/order/orderDetail.vue
@@ -9,13 +9,14 @@
       <div class="title">用户信息</div>
       <div class="acea-row">
         <div class="description-term">用户昵称：{{orderDatalist.user?orderDatalist.user.nickname:orderDatalist.realName}}</div>
-        <div class="description-term">收货人：{{orderDatalist.realName}}</div>
-        <div class="description-term">联系电话：{{orderDatalist.userPhone}}</div>
-        <div class="description-term" v-if="orderDatalist.statusStr.key !== 'toBeWrittenOff'">收货地址：{{orderDatalist.userAddress}}</div>
+        <div class="description-term">绑定电话：{{orderDatalist.user.phone}}</div>
       </div>
       <el-divider></el-divider>
-      <div class="title">收货信息</div>
+      <div class="title">{{orderDatalist.statusStr.key === 'toBeWrittenOff'?'提货信息': '收货信息'}}</div>
       <div class="acea-row">
+        <div class="description-term">{{orderDatalist.statusStr.key === 'toBeWrittenOff'?'提货人': '收货人'}}：{{orderDatalist.realName}}</div>
+        <div class="description-term">{{orderDatalist.statusStr.key === 'toBeWrittenOff'?'提货电话': '收货电话'}}：{{orderDatalist.userPhone}}</div>
+        <div class="description-term" v-if="orderDatalist.statusStr.key !== 'toBeWrittenOff'">{{orderDatalist.statusStr.key === 'toBeWrittenOff'?'提货地址': '收货地址'}}：{{orderDatalist.userAddress}}</div>
         <div class="description-term">订单编号：{{orderDatalist.orderId}}</div>
         <div class="description-term">订单状态：{{orderDatalist.status | orderStatusFilter}}</div>
         <div class="description-term">商品总数：{{orderDatalist.totalNum}}</div>
@@ -32,7 +33,13 @@
         <div class="description-term" v-if="orderDatalist.shippingType === 2 && orderDatalist.statusStr.key === 'notShipped'">门店名称：{{orderDatalist.storeName}}</div>
         <div class="description-term" v-if="orderDatalist.shippingType === 2 && orderDatalist.statusStr.key === 'notShipped'">核销码：{{orderDatalist.user_phone}}</div>
         <div class="description-term">商家备注：{{orderDatalist.remark}}</div>
-        <div class="description-term" v-if="orderDatalist.statusStr.key === 'toBeWrittenOff'">提货码：{{orderDatalist.verifyCode}}</div>
+        <template v-if="orderDatalist.statusStr.key === 'toBeWrittenOff' && orderDatalist.systemStore">
+          <div class="description-term">提货码：{{orderDatalist.verifyCode}}</div>
+          <div class="description-term">门店名称：{{orderDatalist.systemStore.name}}</div>
+          <div class="description-term">门店电话：{{orderDatalist.systemStore.phone}}</div>
+          <div class="description-term">门店地址：{{orderDatalist.systemStore.address + orderDatalist.systemStore.detailedAddress}}</div>
+        </template>
+
       </div>
       <template v-if="orderDatalist.deliveryType === 'express'">
         <el-divider></el-divider>
diff --git a/app/.gitignore b/app/.gitignore
deleted file mode 100644
index 95cfff78..00000000
--- a/app/.gitignore
+++ /dev/null
@@ -1,24 +0,0 @@
-.DS_Store
-node_modules
-/dist
-
-# local env files
-.env.local
-.env.*.local
-
-# Log files
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-
-# Editor directories and files
-.idea
-.vscode
-*.suo
-*.ntvs*
-*.njsproj
-*.sln
-*.sw?
-build.sh
-.idea
-unpackage
\ No newline at end of file
diff --git a/app/libs/wechat.js b/app/libs/wechat.js
index dfa2827d..dece4cc2 100644
--- a/app/libs/wechat.js
+++ b/app/libs/wechat.js
@@ -159,7 +159,7 @@ class AuthWechat {
 	auth(code) {
 		return new Promise((resolve, reject) => {
 			let loginType = Cache.get(LOGINTYPE);
-			alert(Cache.get("spread"))
+			console.log('spread', Cache.get("spread"))
 			wechatAuth(code, Cache.get("spread"), loginType)
 				.then(({
 					data
diff --git a/app/pages/index/index001.vue b/app/pages/index/index001.vue
deleted file mode 100644
index cdc0bbdb..00000000
--- a/app/pages/index/index001.vue
+++ /dev/null
@@ -1,1917 +0,0 @@
-<template>
-	<view class="page-index copy-data" :class="{'bgf':navIndex >0}" :data-clipboard-text="copywords">
-		<!-- #ifdef H5 -->
-		<view class="header">
-			<view class="serch-wrapper flex">
-				<view class="logo">
-					<!-- <image v-if="!logoUrl" class="logo" src="/static/images/crmeb.png"></image> -->
-					<image :src="logoUrl" mode=""></image>
-				</view>
-				<navigator url="/pages/goods_search/index" class="input" hover-class="none"><text class="iconfont icon-xiazai5"></text>
-					搜索商品</navigator>
-			</view>
-			<tabNav class="tabNav" :class="{'fixed':isFixed}" :tabTitle="navTop" @changeTab='changeTab' @emChildTab='emChildTab'
-			 @childTab='childTab'></tabNav>
-		</view>
-		<!-- #endif -->
-		<!-- #ifdef MP -->
-		<view class="mp-header">
-			<view class="sys-head" view :style="{ height: statusBarHeight }"></view>
-			<view class="serch-box" view style="height: 43px;">
-				<view class="serch-wrapper flex">
-					<view class="logo">
-						<!-- <image class="logo" src="/static/images/crmeb.png"></image> -->
-						<image :src="logoUrl" mode=""></image>
-					</view>
-					<navigator url="/pages/goods_search/index" class="input" hover-class="none"><text class="iconfont icon-xiazai5"></text>
-						搜索商品</navigator>
-				</view>
-			</view>
-			<tabNav class="tabNav" :tabTitle="navTop" @changeTab='changeTab'></tabNav>
-		</view>
-		<!-- #endif -->
-		<!-- 首页展示 -->
-		<view class="page_content" :style="'margin-top:'+(marTop+30)+'px;'" v-if="navIndex == 0">
-			<!-- #ifdef MP -->
-			<view class="mp-bg"></view>
-			<!-- #endif -->
-			<!-- banner -->
-			<view class="swiper">
-				<swiper indicator-dots="true" :autoplay="true" :circular="circular" :interval="interval" :duration="duration"
-				 indicator-color="rgba(255,255,255,0.6)" indicator-active-color="#fff">
-					<block v-for="(item,index) in imgUrls" :key="index">
-						<swiper-item>
-							<navigator :url='item.url' class='slide-navigator acea-row row-between-wrapper' hover-class='none'>
-								<image :src="item.pic" class="slide-image"></image>
-							</navigator>
-						</swiper-item>
-					</block>
-				</swiper>
-			</view>
-			<!-- menu -->
-			<view class='nav acea-row' v-if="menus.length">
-				<block v-for="(item,index) in menus" :key="index">
-					<navigator class='item' v-if="item.show == '1'" :url='item.url' open-type='switchTab' hover-class='none'>
-						<view class='pictrue'>
-							<image :src='item.pic'></image>
-						</view>
-						<view class="menu-txt">{{item.name}}</view>
-					</navigator>
-					<navigator class='item' v-else :url='item.url' hover-class='none'>
-						<view class='pictrue'>
-							<image :src='item.pic'></image>
-						</view>
-						<view class="menu-txt">{{item.name}}</view>
-					</navigator>
-				</block>
-			</view>
-			<!-- 直播 -->
-			<!-- #ifdef MP -->
-			<block v-if="liveList.length>0">
-				<navigator :url="'plugin-private://wx2b03c6e691cd7370/pages/live-player-plugin?room_id='+liveList[0].roomid" class="live-wrapper"
-				 v-if="liveList.length==1" hover-class="none">
-					<view class="live-top" :class="liveList[0].live_status == 101?'pictrue_log_xl':liveList[0].live_status == 103?'pictrue_log_xl_gray':'pictrue_log_xl_blue'">
-						<block v-if="liveList[0].live_status == 101">
-							<image src="/static/images/live-01.png" mode=""></image>
-							<text>直播中</text>
-						</block>
-						<block v-if="liveList[0].live_status == 103">
-							<image src="/static/images/live-02.png" mode=""></image>
-							<text>已结束</text>
-						</block>
-						<block v-if="liveList[0].live_status == 102">
-							<image src="/static/images/live-03.png" mode=""></image>
-							<text>未开始</text>
-						</block>
-					</view>
-					<image :src="liveList[0].share_img"></image>
-					<view class="live-title line1">{{liveList[0].name}}</view>
-				</navigator>
-				<view class="live-wrapper mores" v-else>
-					<scroll-view scroll-x="true" style="white-space: nowrap; display: flex">
-						<navigator hover-class="none" class="item" v-for="(item,index) in liveList" :key="index" :url="'plugin-private://wx2b03c6e691cd7370/pages/live-player-plugin?room_id='+item.roomid">
-							<view class="live-top" :class="item.type == 1?'pictrue_log_xl':item.type == 2?'pictrue_log_xl_gray':'pictrue_log_xl_blue'">
-								<block v-if="item.live_status == 101">
-									<image src="/static/images/live-01.png" mode=""></image>
-									<text>直播中</text>
-								</block>
-								<block v-if="item.live_status == 103">
-									<image src="/static/images/live-02.png" mode=""></image>
-									<text>已结束</text>
-								</block>
-								<block v-if="item.live_status == 102">
-									<image src="/static/images/live-03.png" mode=""></image>
-									<text>未开始</text>
-								</block>
-							</view>
-							<image :src="item.share_img"></image>
-							<view class="live-title">{{item.name}}</view>
-						</navigator>
-					</scroll-view>
-				</view>
-			</block>
-			<!-- #endif -->
-			<!-- 拼团热点图 -->
-			<view class="hot-img" :style="{'marginTop':liveList.length>0?'40rpx':'0'}">
-				<swiper :autoplay="autoplay" :circular="circular" :interval="interval">
-					<block v-for="(item,index) in activityList" :key="index">
-						<swiper-item>
-							<navigator :url='item.link' class='slide-navigator acea-row row-between-wrapper' hover-class='none'>
-								<image :src="item.image" class="slide-image"></image>
-							</navigator>
-						</swiper-item>
-					</block>
-				</swiper>
-			</view>
-			<!-- 超值爆款 -->
-			<view class="explosion">
-				<view class="hd">
-					<image src="/static/images/explosion-title.png" mode=""></image>
-					<view class="txt">美好生活由此开始</view>
-				</view>
-				<view class="bd">
-					<navigator class="item" v-for="(item,index) in explosiveMoney" :key="index" :url="'/pages/columnGoods/HotNewGoods/index?type='+item.type"
-					 hover-class='none'>
-						<view class="con-box">
-							<view class="title line1">{{item.title}}</view>
-							<view class="con line2">{{item.info}}</view>
-							<view class="go">GO！<image src="/static/images/right-icon.png" mode=""></image>
-							</view>
-						</view>
-						<image :src="item.image"></image>
-					</navigator>
-				</view>
-			</view>
-			<!-- 限时秒杀 -->
-			<view class="spike-box" v-if="spikeList.length>0">
-				<view class="hd">
-					<view class="left">
-						<image src="/static/images/spike-icon-002.gif" class="icon"></image>
-						<image src="/static/images/spike-icon-001.png" class="title"></image>
-						<countDown :is-day="false" :tip-text="' '" :day-text="' '" :hour-text="' : '" :minute-text="' : '" :second-text="' '"
-						 :datatime="datatime"></countDown>
-					</view>
-					<navigator class="more" url="/pages/activity/goods_seckill/index">更多 <text class="iconfont icon-jiantou"
-						 hover-class='none'></text></navigator>
-				</view>
-				<view class="spike-wrapper">
-					<scroll-view scroll-x="true" style="white-space: nowrap; display: flex" show-scrollbar="false">
-						<navigator class="spike-item" v-for="(item,index) in spikeList" :key="index" :url="'/pages/activity/goods_seckill_details/index?id='+item.id+'&time='+datatime+'&status=1'"
-						 hover-class='none'>
-							<view class="img-box">
-								<image :src="item.image" mode=""></image>
-								<view class="msg flex-aj-center">{{item.discountNum}}折起</view>
-							</view>
-							<view class="info">
-								<view class="name line1">{{item.title}}</view>
-								<view class="price-box">
-									<text class="tips">抢</text>
-									<text class="price"><text>￥</text>{{item.price}}</text>
-								</view>
-							</view>
-						</navigator>
-					</scroll-view>
-				</view>
-			</view>
-			<!-- 砍价专区 -->
-			<view class="barg" v-if="bargList.length>0">
-				<view class="title">
-					<image src="/static/images/barg001.png" mode=""></image>
-				</view>
-				<view class="barg-swiper">
-					<scroll-view scroll-x="true" style="white-space: nowrap; display: flex" show-scrollbar="true">
-						<view class="wrapper">
-							<block v-for="(item,index) in bargList" :key="index">
-								<view class='list-box' @click="bargDetail(item)">
-									<image :src="item.image" class="slide-image"></image>
-									<view class="info-txt">
-										<view class="price">￥{{item.price}}</view>
-										<view class="txt">立即砍价</view>
-									</view>
-								</view>
-							</block>
-							<navigator url="/pages/activity/goods_bargain/index" class="more-box" hover-class="none">
-								<view class="txt">查看更多</view>
-								<image src="/static/images/mores.png"></image>
-							</navigator>
-						</view>
-
-					</scroll-view>
-				</view>
-			</view>
-			<!-- 拼团活动 -->
-			<view class="group-wrapper" v-if="combinationList.length>0">
-				<view class="hd">
-					<view class="left">
-						<image src="/static/images/group02.gif" class="icon"></image>
-						<image src="/static/images/group01.png" class="title"></image>
-						<view class="person">
-							<view class="avatar-box">
-								<block v-for="item in pinkInfo.avatars">
-									<image :src="item" mode=""></image>
-								</block>
-							</view>
-							<view class="num" v-if="pinkInfo.pink_count>0">{{pinkInfo.pink_count}}人拼团成功</view>
-						</view>
-					</view>
-					<navigator class="more" url="/pages/activity/goods_combination/index" hover-class="none">更多 <text class="iconfont icon-jiantou"></text></navigator>
-				</view>
-				<view class="group-scroll">
-					<scroll-view scroll-x="true" style="white-space: nowrap; display: flex" show-scrollbar="false">
-						<navigator class="group-item" v-for="(item,index) in combinationList" :key="index" :url="'/pages/activity/goods_combination_details/index?id='+item.id"
-						 hover-class="none">
-							<image :src="item.image" mode=""></image>
-							<view class="info">
-								<view class="name line1">{{item.title}}</view>
-								<view class="price-box">
-									<text class="tips">拼团价</text>
-									<text class="price"><text>￥</text>{{item.price}}</text>
-								</view>
-							</view>
-							<view class="bom-btn">参与拼团</view>
-						</navigator>
-					</scroll-view>
-				</view>
-			</view>
-			<!-- 精品推荐 -->
-			<view class='boutique'>
-				<swiper autoplay="true" indicator-dots="true" :circular="circular" :interval="interval" :duration="duration"
-				 indicator-color="rgba(0,0,0,.4)" indicator-active-color="#fff">
-					<block v-for="(item,index) in bastBanner" :key="index">
-						<swiper-item>
-							<navigator :url='item.link' style='width:100%;height:100%;' hover-class='none'>
-								<image :src="item.img" class="slide-image" />
-							</navigator>
-						</swiper-item>
-					</block>
-				</swiper>
-			</view>
-			<!-- 首页推荐 -->
-			<view class="index-product-wrapper" style="min-height: 1500rpx;">
-				<view class="nav-bd">
-					<view class="item" v-for="(item,index) in explosiveMoney" :key="index" :index="item.id" :class="{active:index == ProductNavindex}"
-					 @click="ProductNavTab(item,index)">
-						<view class="txt">{{item.title}}</view>
-						<view class="label">{{item.info2}}</view>
-					</view>
-				</view>
-				<!-- 首发新品 -->
-				<view class="list-box animated" :class='tempArr.length > 0?"fadeIn on":""'>
-					<view class="item" v-for="(item,index) in tempArr" :key="index" @click="goDetail(item)">
-						<view class="pictrue">
-							<span class="pictrue_log pictrue_log_class" v-if="item.activity && item.activity.type === '1'">秒杀</span>
-							<span class="pictrue_log pictrue_log_class" v-if="item.activity && item.activity.type === '2'">砍价</span>
-							<span class="pictrue_log pictrue_log_class" v-if="item.activity && item.activity.type === '3'">拼团</span>
-							<image :src="item.image" mode=""></image>
-						</view>
-						<view class="text-info">
-							<view class="title line1">{{item.store_name}}</view>
-							<view class="old-price"><text>¥</text>{{item.ot_price}}</view>
-							<view class="price">
-								<text>￥</text>{{item.price}}
-								<view class="txt" v-if="item.checkCoupon">券</view>
-							</view>
-						</view>
-					</view>
-				</view>
-				<view class='loadingicon acea-row row-center-wrapper' v-if="goodScroll">
-					<text class='loading iconfont icon-jiazai' :hidden='loading==false'></text>
-				</view>
-				<view class="mores-txt flex" v-if="!goodScroll">
-					<text>我是有底线的</text>
-				</view>
-			</view>
-		</view>
-		<!-- 分类页 -->
-		<view class="productList" v-if="navIndex>0" :style="'margin-top:'+prodeuctTop+'px'">
-			<block v-if="sortProduct.length>0">
-				<view class='list acea-row row-between-wrapper' :class='is_switch==true?"":"on"'>
-					<view class='item' :class='is_switch==true?"":"on"' hover-class='none' v-for="(item,index) in sortProduct" :key="index"
-					 @click="godDetail(item)">
-						<view class='pictrue' :class='is_switch==true?"":"on"'>
-							<image :src='item.image' :class='is_switch==true?"":"on"'></image>
-							<span class="pictrue_log_class" :class="is_switch === true ? 'pictrue_log_big' : 'pictrue_log'" v-if="item.activity && item.activity.type === '1'">秒杀</span>
-							<span class="pictrue_log_class" :class="is_switch === true ? 'pictrue_log_big' : 'pictrue_log'" v-if="item.activity && item.activity.type === '2'">砍价</span>
-							<span class="pictrue_log_class" :class="is_switch === true ? 'pictrue_log_big' : 'pictrue_log'" v-if="item.activity && item.activity.type === '3'">拼团</span>
-						</view>
-						<view class='text' :class='is_switch==true?"":"on"'>
-							<view class='name line1'>{{item.store_name}}</view>
-							<view class='money font-color' :class='is_switch==true?"":"on"'>￥<text class='num'>{{item.price}}</text></view>
-							<view class='vip acea-row row-between-wrapper' :class='is_switch==true?"":"on"'>
-								<view class='vip-money' v-if="item.vip_price && item.vip_price > 0">￥{{item.vip_price}}
-									<image src='../../static/images/vip.png'></image>
-								</view>
-								<view>已售{{item.sales}}件</view>
-							</view>
-						</view>
-					</view>
-					<view class='loadingicon acea-row row-center-wrapper' v-if='sortProduct.length > 0'>
-						<text class='loading iconfont icon-jiazai' :hidden='loading==false'></text>{{loadTitle}}
-					</view>
-				</view>
-			</block>
-			<block v-if="sortProduct.length == 0">
-				<view class="noCommodity">
-					<view class='pictrue'>
-						<image src='/static/images/noShopper.png'></image>
-					</view>
-					<recommend :hostProduct="hostProduct"></recommend>
-				</view>
-
-			</block>
-		</view>
-		<coupon-window :window='window' :couponList="couponList" @onColse="onColse"></coupon-window>
-		<!-- #ifdef MP -->
-		<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse" :isGoIndex="false"></authorize>
-		<!-- #endif -->
-	</view>
-</template>
-
-<script>
-	var statusBarHeight = uni.getSystemInfoSync().statusBarHeight + 'px';
-	let app = getApp();
-	import {
-		getIndexData,
-		getCoupons,
-		pink
-	} from '@/api/api.js';
-	// #ifdef MP-WEIXIN
-	import {
-		getTemlIds,
-		getLiveList
-	} from '@/api/api.js';
-	import {
-		SUBSCRIBE_MESSAGE,
-		TIPS_KEY
-	} from '@/config/cache';
-	// #endif
-	// #ifdef H5  
-	import {
-		getShare,
-		follow
-	} from '@/api/public.js';
-	// #endif
-	import {
-		copyWords
-	} from '@/api/public.js';
-	import goodList from '@/components/goodList';
-	import promotionGood from '@/components/promotionGood';
-	import couponWindow from '@/components/couponWindow';
-	import ClipboardJS from "@/plugin/clipboard/clipboard.js";
-	import {
-		goShopDetail
-	} from '@/libs/order.js'
-	import {
-		mapGetters
-	} from "vuex";
-	import tabNav from '@/components/tabNav.vue'
-	import {
-		getSeckillIndexTime,
-		getSeckillList,
-		getBargainList,
-		getCombinationList
-	} from '@/api/activity.js';
-	import countDown from '@/components/countDown';
-	import {
-		getCategoryList,
-		getProductslist,
-		getProductHot,
-		getGroomList
-	} from '@/api/store.js';
-	import {
-		setVisit
-	} from '@/api/user.js'
-	import recommend from '@/components/recommend';
-	// #ifdef MP
-	import authorize from '@/components/Authorize';
-	// #endif
-	import {
-		silenceBindingSpread
-	} from '@/utils';
-	export default {
-		computed: mapGetters(['isLogin', 'uid']),
-		components: {
-			tabNav,
-			goodList,
-			promotionGood,
-			couponWindow,
-			countDown,
-			recommend,
-			// #ifdef MP
-			authorize
-			// #endif
-		},
-		data() {
-			return {
-				loading: false,
-				isAuto: false, //没有授权的不会自动授权
-				isShowAuth: false, //是否隐藏授权
-				statusBarHeight: statusBarHeight,
-				navIndex: 0,
-				navTop: [],
-				subscribe: false,
-				followUrl: "",
-				followHid: true,
-				followCode: false,
-				logoUrl: "",
-				imgUrls: [],
-				itemNew: [],
-				activityList: [],
-				menus: [],
-				bastBanner: [],
-				bastInfo: '',
-				bastList: [],
-				fastInfo: '',
-				fastList: [],
-				firstInfo: '',
-				firstList: [],
-				salesInfo: '',
-				likeInfo: [],
-				benefit: [],
-				indicatorDots: false,
-				circular: true,
-				autoplay: true,
-				interval: 3000,
-				duration: 500,
-				window: false,
-				iShidden: false,
-				navH: "",
-				newGoodsBananr: '',
-				couponList: [],
-				lovely: [],
-				liveList: [],
-				spikeList: [],
-				combinationList: [],
-				hotList: [{
-					pic: '/static/images/hot_001.png'
-				}, {
-					pic: '/static/images/hot_002.png'
-				}, {
-					pic: '/static/images/hot_003.png'
-				}],
-				bargList: [],
-				ProductNavindex: 0,
-				marTop: 0,
-				datatime: 0,
-				childID: 0,
-				loadend: false,
-				loading: false,
-				loadTitle: '加载更多',
-				sortProduct: [],
-				where: {
-					cid: 0,
-					page: 1,
-					limit: 20,
-				},
-				is_switch: true,
-				hostProduct: [],
-				hotPage: 1,
-				hotLimit: 10,
-				hotScroll: false,
-				explosiveMoney: [],
-				prodeuctTop: 0,
-				pinkInfo: '',
-				searchH: 0,
-				isFixed: false,
-				goodType: 0, //精品推荐Type
-				goodScroll: true, //精品推荐开关
-				params: { //精品推荐分页
-					page: 1,
-					limit: 10,
-				},
-				tempArr: [], //精品推荐临时数组
-				pageInfo: '', // 精品推荐全数据
-				site_name: '', //首页title
-				copywords:''
-			}
-		},
-		onLoad() {
-			uni.getLocation({
-				type: 'wgs84',
-				success: function(res) {
-					try {
-						uni.setStorageSync('user_latitude', res.latitude);
-						uni.setStorageSync('user_longitude', res.longitude);
-					} catch {}
-				}
-			});
-			let self = this
-			// #ifdef MP
-			// 获取小程序头部高度
-			this.navH = app.globalData.navHeight;
-			let info = uni.createSelectorQuery().select(".mp-header");
-			info.boundingClientRect(function(data) {
-				self.marTop = data.height
-			}).exec()
-			// #endif
-			// #ifndef MP
-			this.navH = 0;
-			// #endif
-			this.isLogin && silenceBindingSpread();
-			Promise.all([this.getAllCategory(), this.getIndexConfig(), this.getSeckillIndexTime(), this.getBargainList(), this.getCombinationList(),
-				this.pink(), this.setVisit()
-			]);
-			// #ifdef MP
-			this.getTemlIds()
-			this.getLiveList()
-			// #endif
-		},
-		onShow() {
-			let self = this
-			uni.setNavigationBarTitle({
-				title: self.site_name
-			})
-			this.copy();
-			// #ifdef H5
-			this.$nextTick(function() {
-				const clipboard = new ClipboardJS(".copy-data");
-				clipboard.on("success", () => {
-					// this.$util.Tips({
-					// 	title: '已成功复制口令'
-					// });
-				});
-			});
-			// #endif
-		},
-		methods: {
-			copy(){
-				let that = this;
-				copyWords().then(res=>{
-					that.copywords = res.data.words;
-					// #ifndef H5
-					uni.setClipboardData({
-					    data: res.data.words,
-					    success: function () {
-							// return that.$util.Tips({
-							// 	title: '已成功复制口令'
-							// });
-					    }
-					});
-					// #endif
-				})
-			},
-			// #ifdef MP
-			getTemlIds(){
-			    let messageTmplIds = wx.getStorageSync(SUBSCRIBE_MESSAGE);
-			    if (!messageTmplIds){
-			      getTemlIds().then(res=>{
-			        if (res.data) 
-			          wx.setStorageSync(SUBSCRIBE_MESSAGE, JSON.stringify(res.data));
-			      })
-			    }
-			},
-			// #endif
-			// 关闭优惠券弹窗
-			onColse(){
-				this.$set(this, "window", false);
-			},
-			// 记录会员访问
-			setVisit() {
-				setVisit({
-					url: '/pages/index/index'
-				}).then(res => {
-					console.log(res)
-				})
-			},
-			// 获取导航
-			getAllCategory: function() {
-				let that = this;
-				getCategoryList().then(res => {
-					res.data.unshift({
-						'name': '首页'
-					})
-					that.navTop = res.data;
-					console.log(res.data);
-				})
-			},
-			// 导航分类切换
-			changeTab(e) {
-				let self = this
-				if (e.type == 'big') {
-					if (e.index == 0) {
-						this.navIndex = e.index
-					} else {
-						// #ifdef MP
-						setTimeout(res => {
-							this.navH = app.globalData.navHeight;
-							let info = uni.createSelectorQuery().select(".mp-header");
-							info.boundingClientRect(function(data) {
-								self.prodeuctTop = data.height
-							}).exec()
-						}, 300)
-						// #endif
-						// #ifdef H5
-						self.prodeuctTop = 18
-						// #endif
-						this.navIndex = e.index
-						if (this.navTop[e.index].children.length > 0) {
-							this.where.cid = this.navTop[e.index].children[0].id
-						} else {
-							this.where.cid = this.navTop[e.index].id
-						}
-						this.loadend = false
-						this.loading = false
-						this.where.page = 1
-						this.sortProduct = []
-						this.get_product_list()
-					}
-				} else {
-					this.navIndex = e.parentIndex
-					this.where.cid = this.navTop[e.parentIndex].children[e.childIndex].id
-					this.loadend = false
-					this.loading = false
-					this.where.page = 1
-					this.sortProduct = []
-					this.get_product_list()
-				}
-			},
-			//分类产品
-			get_product_list: function(isPage) {
-				let that = this;
-				if (that.loadend) return;
-				if (that.loading) return;
-				// if (isPage === true) that.$set(that, 'productList', []);
-				that.loading = true;
-				that.loadTitle = '';
-				getProductslist(that.where).then(res => {
-					if (that.where.page == 1 && res.data.length == 0) {
-						that.hotScroll = false
-						that.hotPage = 1
-						that.hostProduct = []
-						this.get_host_product()
-					}
-					let list = res.data;
-					let productList = that.$util.SplitArray(list, that.sortProduct);
-					let loadend = list.length < that.where.limit;
-					that.loadend = loadend;
-					that.loading = false;
-					that.loadTitle = loadend ? '已全部加载' : '加载更多';
-					that.$set(that, 'sortProduct', productList);
-					that.$set(that.where, 'page', that.where.page + 1);
-				}).catch(err => {
-					that.loading = false;
-					that.loadTitle = '加载更多';
-				});
-			},
-			/**
-			 * 获取我的推荐
-			 */
-			get_host_product: function() {
-				let that = this;
-				that.loading = true;
-
-				if (that.hotScroll) return
-				getProductHot(
-					that.hotPage,
-					that.hotLimit,
-				).then(res => {
-					that.hotPage++
-					that.hotScroll = res.data.length < that.hotLimit
-					that.hostProduct = that.hostProduct.concat(res.data)
-					// that.$set(that, 'hostProduct', res.data)
-				});
-			},
-
-			// 首页数据
-			getIndexConfig: function() {
-				let that = this;
-				getIndexData().then(res => {
-					uni.setNavigationBarTitle({
-						title: res.data.site_name
-					})
-					that.$set(that, "logoUrl", res.data.logoUrl);
-					that.$set(that, "site_name", res.data.site_name);
-					that.$set(that, "imgUrls", res.data.banner);
-					that.$set(that, "menus", res.data.menus);
-					that.$set(that, "activityList", res.data.activity);
-					that.lovely = res.data.lovely
-					that.$set(that, "pageInfo", res.data)
-					that.$set(that, "firstList", res.data.info.firstList);
-					that.$set(that, "bastList", res.data.info.bastList);
-					that.$set(that, "likeInfo", res.data.likeInfo);
-					that.$set(that, "benefit", res.data.benefit);
-					that.$set(that, "bastBanner", res.data.info.bastBanner);
-					that.$set(that, "couponList", res.data.couponList);
-					that.explosiveMoney = res.data.explosive_money
-					that.goodType = res.data.explosive_money[0].type
-					// #ifdef H5
-					that.subscribe = res.data.subscribe;
-					that.setOpenShare();
-					// #endif
-					// 小程序判断用户是否授权；
-					// #ifdef MP
-					uni.getSetting({
-						success(res) {
-							if (!res.authSetting['scope.userInfo']) {
-								that.window = that.couponList.length ? true : false;
-							} else {
-								that.window = false;
-								that.iShidden = true;
-							}
-						}
-					});
-					// #endif
-					// #ifndef MP
-					if (that.isLogin) {
-						that.window = false;
-					} else {
-						that.window = that.couponList.length ? true : false;
-					}
-					// #endif
-					this.getGroomList();
-				})
-			},
-			// 微信分享；
-			setOpenShare: function() {
-				let that = this;
-				if (that.$wechat.isWeixin()) {
-					getShare().then(res => {
-						let data = res.data.data;
-						let configAppMessage = {
-							desc: data.synopsis,
-							title: data.title,
-							link: location.href,
-							imgUrl: data.img
-						};
-						that.$wechat.wechatEvevt(["updateAppMessageShareData", "updateTimelineShareData"], configAppMessage);
-					})
-				}
-			},
-			// 秒杀
-			getSeckillIndexTime() {
-				let params = {
-					page: 1,
-					limit: 6,
-					type: 'index'
-				}
-				getSeckillIndexTime().then(res => {
-					this.datatime = res.data.seckillTime[res.data.seckillTimeIndex].stop
-					let id = res.data.seckillTime[res.data.seckillTimeIndex].id
-					getSeckillList(id, params).then(({
-						data
-					}) => {
-						data.forEach((item) => {
-							let num = ((parseFloat(item.price) / parseFloat(item.ot_price)).toFixed(2))
-							item.discountNum = this.$util.$h.Mul(num, 10)
-						})
-						this.spikeList = data
-					})
-				})
-			},
-			// 砍价列表
-			getBargainList() {
-				getBargainList({
-					page: 1,
-					limit: 20
-				}).then(res => {
-					this.bargList = res.data
-				})
-			},
-			// 拼团列表
-			getCombinationList: function() {
-				var that = this;
-				var data = {
-					page: 1,
-					limit: 6
-				};
-				getCombinationList(data).then(function(res) {
-					var combinationList = that.combinationList;
-					that.combinationList = combinationList.concat(res.data);
-				}).catch(() => {
-					that.loading = false
-				})
-			},
-			// 拼团数据
-			pink: function() {
-				pink().then(res => {
-					this.pinkInfo = res.data
-				})
-			},
-			// 砍价详情
-			bargDetail(item) {
-				if (!this.isLogin) {
-					// #ifdef H5
-					uni.showModal({
-						title: '提示',
-						content: '您未登陆，请登陆！',
-						success: function(res) {
-							if (res.confirm) {
-								uni.navigateTo({
-									url: '/pages/users/login/index'
-								})
-							} else if (res.cancel) {}
-						}
-					})
-					// #endif
-					// #ifdef MP
-					this.$set(this, 'isAuto', true);
-					this.$set(this, 'isShowAuth', true);
-					// #endif
-				} else {
-					uni.navigateTo({
-						url: `/pages/activity/goods_bargain_details/index?id=${item.id}&bargain=${this.uid}`
-					})
-				}
-			},
-			// 授权关闭
-			authColse: function(e) {
-				this.isShowAuth = e
-			},
-			// 授权回调
-			onLoadFun() {
-
-			},
-			// 首发新品切换
-			ProductNavTab(item, index) {
-				this.goodType = item.type
-				this.ProductNavindex = index
-				this.tempArr = []
-				this.params.page = 1
-				this.goodScroll = true
-				this.getGroomList()
-			},
-			// 首发新品详情
-			goDetail(item) {
-				if (item.activity && item.activity.type === "2" && !this.isLogin) {
-					// #ifdef H5
-					uni.showModal({
-						title: '提示',
-						content: '您未登陆，请登陆！',
-						success: function(res) {
-							if (res.confirm) {
-								uni.navigateTo({
-									url: '/pages/users/login/index'
-								})
-							} else if (res.cancel) {}
-						}
-					})
-					// #endif
-					// #ifdef MP
-					this.$set(this, 'isAuto', true);
-					this.$set(this, 'isShowAuth', true);
-					// #endif
-					return
-				} else {
-					goShopDetail(item, this.uid).then(res => {
-						uni.navigateTo({
-							url: `/pages/goods_details/index?id=${item.id}`
-						})
-					})
-				}
-			},
-			// 分类详情
-			godDetail(item) {
-				goShopDetail(item, this.uid).then(res => {
-					uni.navigateTo({
-						url: `/pages/goods_details/index?id=${item.id}`
-					})
-				})
-			},
-			// 直播
-			getLiveList: function() {
-				getLiveList(1, 20).then(res => {
-					this.liveList = res.data
-				}).catch(res => {
-
-				})
-			},
-			// 精品推荐
-			getGroomList() {
-				this.loading = true
-				let type = this.goodType;
-				if (!this.goodScroll) return
-				getGroomList(type, this.params).then(({
-					data
-				}) => {
-					this.loading = false
-					this.goodScroll = data.list.length >= this.params.limit
-					this.params.page++
-					this.tempArr = this.tempArr.concat(data.list)
-				})
-			}
-		},
-		mounted() {
-			let self = this
-			// #ifdef H5
-			// 获取H5 搜索框高度
-			let appSearchH = uni.createSelectorQuery().select(".serch-wrapper");
-			appSearchH.boundingClientRect(function(data) {
-				self.searchH = data.height
-			}).exec()
-			// #endif
-		},
-		// 滚动到底部
-		onReachBottom() {
-
-			if (this.navIndex == 0) {
-				// 首页加载更多
-				if (this.params.page != 1) {
-					this.getGroomList();
-				}
-			} else {
-				// 分类栏目加载更多
-				if (this.sortProduct.length > 0) {
-					this.get_product_list();
-				} else {
-					this.get_host_product();
-				}
-			}
-		},
-		// 滚动监听
-		onPageScroll(e) {
-			let self = this
-			if (e.scrollTop >= self.searchH) {
-				self.isFixed = true
-			} else {
-				self.isFixed = false
-			}
-		}
-	}
-</script>
-<style>
-	page {
-		display: flex;
-		flex-direction: column;
-		height: 100%;
-		/* #ifdef H5 */
-		background-color: #fff;
-		/* #endif */
-
-	}
-</style>
-<style lang="scss">
-	/deep/.spike-box .styleAll {
-		display: inline-block;
-		width: 44rpx;
-		height: 40rpx;
-		line-height: 40rpx;
-		padding: 0;
-		text-align: center;
-		border-radius: 8rpx;
-	}
-
-	.page-index {
-		display: flex;
-		flex-direction: column;
-		min-height: 100%;
-		background: linear-gradient(180deg, #fff 0%, #f5f5f5 100%);
-
-		// &.bgf{
-		// 	background: #fff;
-		// }
-		.header {
-			width: 100%;
-			height: 320rpx;
-			background: linear-gradient(90deg, $bg-star 50%, $bg-end 100%);
-
-			.serch-wrapper {
-				align-items: center;
-				padding: 20rpx 50rpx 0 53rpx;
-
-				.logo {
-					width: 118rpx;
-					height: 42rpx;
-					margin-right: 30rpx;
-				}
-
-				image {
-					width: 118rpx;
-					height: 42rpx;
-				}
-
-				.input {
-					display: flex;
-					align-items: center;
-					width: 500rpx;
-					height: 58rpx;
-					padding: 0 0 0 30rpx;
-					background: rgba(247, 247, 247, 1);
-					border: 1px solid rgba(241, 241, 241, 1);
-					border-radius: 29rpx;
-					color: #BBBBBB;
-					font-size: 28rpx;
-
-					.iconfont {
-						margin-right: 20rpx;
-					}
-				}
-			}
-
-			.tabNav {
-				padding-top: 24rpx;
-			}
-		}
-
-		/* #ifdef MP */
-		.mp-header {
-			z-index: 999;
-			position: fixed;
-			left: 0;
-			top: 0;
-			width: 100%;
-			/* #ifdef H5 */
-			padding-bottom: 20rpx;
-			/* #endif */
-			background: linear-gradient(90deg, $bg-star 50%, $bg-end 100%);
-
-			.serch-wrapper {
-				height: 100%;
-				align-items: center;
-				padding: 0 50rpx 0 53rpx;
-
-				image {
-					width: 118rpx;
-					height: 42rpx;
-					margin-right: 30rpx;
-				}
-
-				.input {
-					display: flex;
-					align-items: center;
-					width: 305rpx;
-					height: 58rpx;
-					padding: 0 0 0 30rpx;
-					background: rgba(247, 247, 247, 1);
-					border: 1px solid rgba(241, 241, 241, 1);
-					border-radius: 29rpx;
-					color: #BBBBBB;
-					font-size: 28rpx;
-
-					.iconfont {
-						margin-right: 20rpx;
-					}
-				}
-			}
-		}
-
-		/* #endif */
-
-		.page_content {
-			/* #ifdef H5 */
-			margin-top: -140rpx !important;
-			/* #endif */
-			padding: 0 20rpx;
-
-			.swiper {
-				position: relative;
-				width: 710rpx;
-				height: 280rpx;
-				margin: 0 auto;
-				border-radius: 10rpx;
-				overflow: hidden;
-				/* #ifdef MP */
-				z-index: 10;
-
-				/* #endif */
-				swiper,
-				.swiper-item,
-				image {
-					width: 100%;
-					height: 280rpx;
-					border-radius: 10rpx;
-				}
-			}
-
-			.nav {
-				padding: 0 0rpx 30rpx;
-				flex-wrap: wrap;
-
-				.item {
-					display: flex;
-					flex-direction: column;
-					align-items: center;
-					justify-content: center;
-					width: 20%;
-					margin-top: 30rpx;
-
-					image {
-						width: 82rpx;
-						height: 82rpx;
-					}
-				}
-			}
-
-			.live-wrapper {
-				position: relative;
-				width: 100%;
-				overflow: hidden;
-				border-radius: 16rpx;
-
-				image {
-					width: 100%;
-					height: 400rpx;
-				}
-
-				.live-top {
-					z-index: 20;
-					position: absolute;
-					left: 0;
-					top: 0;
-					display: flex;
-					align-items: center;
-					justify-content: center;
-					color: #fff;
-					width: 180rpx;
-					height: 54rpx;
-					border-radius: 0rpx 0px 18rpx 0px;
-
-					image {
-						width: 30rpx;
-						height: 30rpx;
-						margin-right: 10rpx;
-						/* #ifdef H5 */
-						display: block;
-						/* #endif */
-					}
-				}
-
-				.live-title {
-					position: absolute;
-					left: 0;
-					bottom: 6rpx;
-					width: 100%;
-					height: 70rpx;
-					line-height: 70rpx;
-					text-align: center;
-					font-size: 30rpx;
-					color: #fff;
-					background: rgba(0, 0, 0, .35);
-				}
-
-				&.mores {
-					width: 100%;
-
-					.item {
-						position: relative;
-						width: 320rpx;
-						display: inline-block;
-						border-radius: 16rpx;
-						overflow: hidden;
-						margin-right: 20rpx;
-
-						image {
-							width: 320rpx;
-							height: 180rpx;
-							border-radius: 16rpx;
-						}
-
-						.live-title {
-							height: 40rpx;
-							line-height: 40rpx;
-							text-align: center;
-							font-size: 22rpx;
-						}
-
-						.live-top {
-							width: 120rpx;
-							height: 36rpx;
-							font-size: 22rpx;
-
-							image {
-								width: 20rpx;
-								height: 20rpx;
-							}
-						}
-					}
-				}
-			}
-
-			.hot-img {
-				/* #ifndef H5 */
-				margin-top: 40rpx;
-
-				/* #endif */
-				swiper,
-				swiper-item image {
-					width: 100%;
-					height: 225rpx;
-				}
-			}
-
-			.explosion {
-				width: 100%;
-				height: 500rpx;
-				margin-top: 20rpx;
-				padding: 30rpx 20rpx;
-				background-image: url('~@/static/images/explosion.png');
-				background-size: 100% 100%;
-				border-radius: 13px;
-
-				.hd {
-					display: flex;
-					align-items: center;
-
-					image {
-						width: 147rpx;
-						height: 35rpx;
-						margin-right: 20rpx;
-					}
-
-					.txt {
-						width: 220rpx;
-						height: 36rpx;
-						background: linear-gradient(90deg, rgba(255, 168, 0, 1) 0%, rgba(255, 34, 15, 1) 100%);
-						border-radius: 26rpx 0px 26rpx 0px;
-						color: #fff;
-						text-align: center;
-						font-size: 22rpx;
-						box-shadow: 3px 1px 1px 1px rgba(255, 203, 199, .8);
-					}
-				}
-
-				.bd {
-					display: flex;
-					flex-wrap: wrap;
-					margin-top: 28rpx;
-
-					.item {
-						display: flex;
-						align-items: center;
-						justify-content: space-between;
-						position: relative;
-						width: 325rpx;
-						height: 180rpx;
-						margin-bottom: 20rpx;
-						margin-right: 20rpx;
-						background-color: #fff;
-						border-radius: 16rpx;
-						padding: 0 20rpx;
-						box-sizing: border-box;
-
-						image {
-							width: 160rpx;
-							height: 160rpx;
-						}
-
-						.con-box {
-							display: flex;
-							flex-direction: column;
-							justify-content: center;
-							width: 120rpx;
-							height: 100%;
-
-							.title {
-								color: #282828;
-								font-size: 30rpx;
-							}
-
-							.con {
-								color: #999999;
-								font-size: 20rpx;
-							}
-
-							.go {
-								display: flex;
-								align-items: center;
-								justify-content: center;
-								margin-top: 10rpx;
-								width: 112rpx;
-								height: 36rpx;
-								border-radius: 18rpx;
-								color: #fff;
-								font-size: 26rpx;
-								font-weight: bold;
-								font-style: italic;
-
-								image {
-									width: 26rpx;
-									height: 26rpx;
-								}
-							}
-						}
-
-						&:first-child .go {
-							background: linear-gradient(90deg, rgba(75, 196, 255, 1) 0%, rgba(32, 126, 255, 1) 100%);
-						}
-
-						&:nth-child(2) .go {
-							background: linear-gradient(90deg, rgba(255, 144, 67, 1) 0%, rgba(255, 83, 29, 1) 100%);
-						}
-
-						&:nth-child(3) .go {
-							background: linear-gradient(90deg, rgba(150, 225, 135, 1) 0%, rgba(72, 206, 44, 1) 100%);
-						}
-
-						&:nth-child(4) .go {
-							background: linear-gradient(90deg, rgba(255, 197, 96, 1) 0%, rgba(255, 156, 0, 1) 100%);
-						}
-
-						&:nth-child(2n) {
-							margin-right: 0;
-						}
-					}
-				}
-			}
-
-			.spike-box {
-				margin-top: 20rpx;
-				padding: 23rpx 20rpx;
-				border-radius: 24rpx;
-				background-color: #fff;
-				overflow: hidden;
-				box-shadow: 0px 0px 16px 3px rgba(0, 0, 0, 0.04);
-
-				.hd {
-					display: flex;
-					align-items: center;
-					justify-content: space-between;
-
-					.left {
-						display: flex;
-						align-items: center;
-						width: 500rpx;
-
-						.icon {
-							width: 38rpx;
-							height: 38rpx;
-							margin-right: 8rpx;
-						}
-
-						.title {
-							width: 134rpx;
-							height: 33rpx;
-						}
-					}
-
-					.more {
-						font-size: 26rpx;
-						color: #999;
-
-						.iconfont {
-							margin-left: 6rpx;
-							font-size: 25rpx;
-						}
-					}
-				}
-
-				.spike-wrapper {
-					width: 100%;
-					margin-top: 27rpx;
-
-					.spike-item {
-						display: inline-block;
-						width: 222rpx;
-						margin-right: 20rpx;
-
-						.img-box {
-							position: relative;
-							height: 222rpx;
-
-							image {
-								width: 100%;
-								height: 222rpx;
-								border-radius: 16rpx;
-							}
-
-							.msg {
-								position: absolute;
-								left: 10rpx;
-								bottom: 16rpx;
-								width: 86rpx;
-								height: 30rpx;
-								background: rgba(255, 255, 255, 1);
-								border: 1px solid rgba(255, 109, 96, 1);
-								border-radius: 6rpx;
-								font-size: 20rpx;
-								color: $theme-color;
-							}
-						}
-
-
-						.info {
-							margin-top: 8rpx;
-							padding: 0 10rpx;
-
-							.name {
-								font-size: 28rpx;
-							}
-
-							.price-box {
-								display: flex;
-								align-items: center;
-								justify-content: center;
-
-								.tips {
-									display: flex;
-									align-items: center;
-									justify-content: center;
-									width: 28rpx;
-									height: 28rpx;
-									background-color: $theme-color;
-									color: #fff;
-									font-size: 20rpx;
-									border-radius: 2px;
-								}
-
-								.price {
-									display: flex;
-									margin-left: 10rpx;
-									color: $theme-color;
-									font-size: 28rpx;
-									font-weight: bold;
-
-									text {
-										font-size: 18rpx;
-									}
-								}
-							}
-						}
-					}
-				}
-			}
-
-			.barg {
-				width: 100%;
-				height: 478rpx;
-				margin-top: 20rpx;
-				padding-left: 20rpx;
-				background-image: url('~@/static/images/barg002.png');
-				background-size: 100% 100%;
-
-				.title {
-					display: flex;
-					align-items: center;
-					justify-content: center;
-					padding-top: 42rpx;
-
-					image {
-						width: 463rpx;
-						height: 39rpx;
-					}
-				}
-
-				.barg-swiper {
-					margin-top: 43rpx;
-					padding-right: 20rpx;
-
-					.wrapper {
-						display: flex;
-					}
-
-					.list-box {
-						flex-shrink: 0;
-						width: 210rpx;
-						background-color: #fff;
-						border-radius: 16rpx;
-						overflow: hidden;
-						padding-bottom: 18rpx;
-						margin-right: 20rpx;
-
-						image {
-							width: 100%;
-							height: 210rpx;
-						}
-
-						.info-txt {
-							width: 100%;
-							display: flex;
-							flex-direction: column;
-							align-items: center;
-							justify-content: center;
-							padding-top: 15rpx;
-
-							.price {
-								font-weight: 700;
-								color: $theme-color;
-							}
-
-							.txt {
-								display: flex;
-								align-items: center;
-								justify-content: center;
-								width: 136rpx;
-								height: 33rpx;
-								margin-top: 10rpx;
-								background: linear-gradient(90deg, $bg-star 0%, $bg-end 100%);
-								border-radius: 17px;
-								font-size: 22rpx;
-								color: #fff;
-
-							}
-						}
-					}
-
-					.more-box {
-						flex-shrink: 0;
-						display: flex;
-						flex-direction: column;
-						align-items: center;
-						justify-content: center;
-						width: 80rpx;
-						background-color: #fff;
-						border-radius: 16rpx;
-
-						image {
-							width: 24rpx;
-							height: 24rpx;
-							margin-top: 10rpx;
-						}
-
-						.txt {
-							display: block;
-							writing-mode: vertical-lr;
-							font-size: 26rpx;
-							line-height: 1.2;
-						}
-					}
-				}
-			}
-
-			.group-wrapper {
-				padding: 26rpx 20rpx;
-				margin-top: 20rpx;
-				background: #fff;
-				border-radius: 24rpx;
-
-				.hd {
-					display: flex;
-					align-items: center;
-					justify-content: space-between;
-
-					.left {
-						display: flex;
-						align-items: center;
-
-						.icon {
-							width: 38rpx;
-							height: 38rpx;
-							margin-right: 8rpx;
-						}
-
-						.title {
-							width: 134rpx;
-							height: 33rpx;
-						}
-
-						.person {
-							display: flex;
-							align-items: center;
-							margin-left: 40rpx;
-
-							.avatar-box {
-								display: flex;
-								align-items: center;
-
-								image {
-									width: 30rpx;
-									height: 30rpx;
-									border-radius: 50%;
-									margin-right: -10rpx;
-								}
-							}
-
-							.num {
-								margin-left: 18rpx;
-								font-size: 26rpx;
-								color: #999999;
-							}
-						}
-					}
-
-					.more {
-						font-size: 26rpx;
-						color: #999;
-
-						.iconfont {
-							margin-left: 6rpx;
-							font-size: 25rpx;
-						}
-					}
-				}
-
-				.group-scroll {
-					width: 100%;
-					margin-top: 25rpx;
-
-					.group-item {
-						display: inline-block;
-						width: 222rpx;
-						margin-right: 20rpx;
-						box-shadow: 0px 2px 6px 2px rgba(0, 0, 0, 0.03);
-						border-radius: 16rpx;
-
-						image {
-							width: 100%;
-							height: 222rpx;
-							border-radius: 16rpx 16rpx 0 0;
-						}
-
-						.info {
-							padding: 8rpx 13rpx;
-
-							.name {
-								font-size: 24rpx;
-							}
-
-							.price-box {
-								display: flex;
-								align-items: center;
-								margin-top: 10rpx;
-
-								.tips {
-									display: flex;
-									align-items: center;
-									justify-content: center;
-									width: 76rpx;
-									height: 30rpx;
-									margin-right: 6rpx;
-									background: linear-gradient(90deg, rgba(255, 0, 0, .1) 0%, rgba(255, 84, 0, .1) 100%);
-									border-radius: 2px;
-									font-size: 20rpx;
-									color: $theme-color;
-								}
-
-								.price {
-									font-size: 26rpx;
-									color: $theme-color;
-									font-weight: 700;
-
-									text {
-										font-size: 20rpx;
-									}
-								}
-							}
-
-						}
-
-						.bom-btn {
-							display: flex;
-							align-items: center;
-							justify-content: center;
-							width: 100%;
-							height: 48rpx;
-							background: linear-gradient(90deg, $bg-star 0%, $bg-end 100%);
-							border-radius: 0px 0px 16rpx 16rpx;
-							color: #fff;
-
-						}
-					}
-				}
-			}
-
-			.boutique {
-				margin-top: 20rpx;
-
-				swiper,
-				swiper-item,
-				.slide-image {
-					width: 100%;
-					height: 240rpx;
-					border-radius: 12rpx;
-				}
-			}
-
-			.index-product-wrapper {
-				margin-top: 40rpx;
-
-				.nav-bd {
-					display: flex;
-					align-items: center;
-
-					.item {
-						display: flex;
-						flex-direction: column;
-						align-items: center;
-						justify-content: center;
-						width: 25%;
-
-						.txt {
-							font-size: 32rpx;
-							color: #282828;
-						}
-
-						.label {
-							display: flex;
-							align-items: center;
-							justify-content: center;
-							width: 124rpx;
-							height: 32rpx;
-							margin-top: 5rpx;
-							font-size: 24rpx;
-							color: #999;
-						}
-
-						&.active {
-							color: $theme-color;
-
-							.label {
-								background: linear-gradient(90deg, $bg-star 0%, $bg-end 100%);
-								border-radius: 16rpx;
-								color: #fff;
-							}
-						}
-					}
-				}
-
-				.list-box {
-					display: flex;
-					flex-wrap: wrap;
-					justify-content: space-between;
-					margin-top: 30rpx;
-
-					.item {
-						width: 345rpx;
-						margin-bottom: 20rpx;
-						background-color: #fff;
-						border-radius: 10px;
-						overflow: hidden;
-
-						image {
-							width: 100%;
-							height: 345rpx;
-						}
-
-						.text-info {
-							padding: 10rpx 20rpx 15rpx;
-
-							.title {
-								color: #222222;
-							}
-
-							.old-price {
-								margin-top: 8rpx;
-								font-size: 26rpx;
-								color: #AAAAAA;
-								text-decoration: line-through;
-
-								text {
-									margin-right: 2px;
-									font-size: 20rpx;
-								}
-							}
-
-							.price {
-								display: flex;
-								align-items: flex-end;
-								color: $theme-color;
-								font-size: 34rpx;
-								font-weight: 800;
-
-								text {
-									padding-bottom: 4rpx;
-									font-size: 24rpx;
-									font-weight: normal;
-								}
-
-								.txt {
-									display: flex;
-									align-items: center;
-									justify-content: center;
-									width: 28rpx;
-									height: 28rpx;
-									margin-left: 15rpx;
-									margin-bottom: 10rpx;
-									border: 1px solid $theme-color;
-									border-radius: 4rpx;
-									font-size: 22rpx;
-									font-weight: normal;
-								}
-							}
-						}
-					}
-
-					&.on {
-						display: flex;
-					}
-				}
-			}
-		}
-	}
-
-	.productList {
-		background-color: #fff;
-	}
-
-	.productList .list {
-		padding: 0 20rpx;
-	}
-
-	.productList .list.on {
-		background-color: #fff;
-		border-top: 1px solid #f6f6f6;
-	}
-
-	.productList .list .item {
-		width: 345rpx;
-		margin-top: 20rpx;
-		background-color: #fff;
-		border-radius: 10rpx;
-	}
-
-	.productList .list .item.on {
-		width: 100%;
-		display: flex;
-		border-bottom: 1rpx solid #f6f6f6;
-		padding: 30rpx 0;
-		margin: 0;
-	}
-
-	.productList .list .item .pictrue {
-		position: relative;
-		width: 100%;
-		height: 345rpx;
-	}
-
-	.productList .list .item .pictrue.on {
-		width: 180rpx;
-		height: 180rpx;
-	}
-
-	.productList .list .item .pictrue image {
-		width: 100%;
-		height: 100%;
-		border-radius: 20rpx 20rpx 0 0;
-	}
-
-	.productList .list .item .pictrue image.on {
-		border-radius: 6rpx;
-	}
-
-	.productList .list .item .text {
-		padding: 20rpx 17rpx 26rpx 17rpx;
-		font-size: 30rpx;
-		color: #222;
-	}
-
-	.productList .list .item .text.on {
-		width: 508rpx;
-		padding: 0 0 0 22rpx;
-	}
-
-	.productList .list .item .text .money {
-		font-size: 26rpx;
-		font-weight: bold;
-		margin-top: 8rpx;
-	}
-
-	.productList .list .item .text .money.on {
-		margin-top: 50rpx;
-	}
-
-	.productList .list .item .text .money .num {
-		font-size: 34rpx;
-	}
-
-	.productList .list .item .text .vip {
-		font-size: 22rpx;
-		color: #aaa;
-		margin-top: 7rpx;
-	}
-
-	.productList .list .item .text .vip.on {
-		margin-top: 12rpx;
-	}
-
-	.productList .list .item .text .vip .vip-money {
-		font-size: 24rpx;
-		color: #282828;
-		font-weight: bold;
-	}
-
-	.productList .list .item .text .vip .vip-money image {
-		width: 46rpx;
-		height: 21rpx;
-		margin-left: 4rpx;
-	}
-
-	.pictrue {
-		position: relative;
-	}
-
-	.fixed {
-		z-index: 100;
-		position: fixed;
-		left: 0;
-		top: 0;
-		background: linear-gradient(90deg, red 50%, #ff5400 100%);
-	}
-
-	.mores-txt {
-		width: 100%;
-		align-items: center;
-		justify-content: center;
-		height: 70rpx;
-		color: #999;
-		font-size: 24rpx;
-
-		.iconfont {
-			margin-top: 2rpx;
-			font-size: 20rpx;
-		}
-	}
-
-	.menu-txt {
-		font-size: 24rpx;
-		color: #454545;
-	}
-
-	.mp-bg {
-		position: absolute;
-		left: 0;
-		top: 0;
-		width: 100%;
-		height: 330rpx;
-		background: linear-gradient(90deg, $bg-star 50%, $bg-end 100%);
-		// border-radius: 0 0 30rpx 30rpx;
-	}
-</style>
diff --git a/app/pages/users/order_list/index.vue b/app/pages/users/order_list/index.vue
index 4ef63dc6..6e7de8cf 100644
--- a/app/pages/users/order_list/index.vue
+++ b/app/pages/users/order_list/index.vue
@@ -5,7 +5,7 @@
 				<view class='picTxt acea-row row-between-wrapper'>
 					<view class='text'>
 						<view class='name'>订单信息</view>
-						<view>消费订单：{{orderData.orderCount || 0}} 总消费：￥{{orderData.sumPrice || 0}}</view>
+						<view>消费订单：{{orderData.orderCount || 0}} 总消费：￥{{Number(orderData.sumPrice).toFixed(2) || 0}}</view>
 					</view>
 					<view class='pictrue'>
 						<image src='../../../static/images/orderTime.png'></image>
diff --git a/app/utils/index.js b/app/utils/index.js
index 31c132ce..8a2b795a 100644
--- a/app/utils/index.js
+++ b/app/utils/index.js
@@ -26,7 +26,7 @@ export function silenceBindingSpread()
 	}
 	if(puid){
 		//#ifdef H5
-		 Cache.set('spread', 0);
+		 Cache.clear('spread');
 		//#endif
 		
 		//#ifdef MP
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/front/service/impl/OrderServiceImpl.java b/crmeb/src/main/java/com/zbkj/crmeb/front/service/impl/OrderServiceImpl.java
index df04dc79..7173dc1a 100644
--- a/crmeb/src/main/java/com/zbkj/crmeb/front/service/impl/OrderServiceImpl.java
+++ b/crmeb/src/main/java/com/zbkj/crmeb/front/service/impl/OrderServiceImpl.java
@@ -620,8 +620,8 @@ public class OrderServiceImpl implements OrderService {
         result.setEvaluatedCount(storeOrderService.getTopDataUtil(Constants.ORDER_STATUS_H5_VERF, currentUser.getUid()).size());
         // 已完成
         result.setCompleteCount(storeOrderService.getTopDataUtil(Constants.ORDER_STATUS_H5_COMPLETE, currentUser.getUid()).size());
-        // 退款中
-        result.setRefundCount(storeOrderService.getTopDataUtil(Constants.ORDER_STATUS_H5_REFUNDING, currentUser.getUid()).size());
+        // 退款中和已退款
+        result.setRefundCount(storeOrderService.getTopDataUtil(Constants.ORDER_STATUS_H5_REFUND, currentUser.getUid()).size());
         return result;
     }
 
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/store/service/impl/StoreProductServiceImpl.java b/crmeb/src/main/java/com/zbkj/crmeb/store/service/impl/StoreProductServiceImpl.java
index d3d79c61..9c3c8cb2 100644
--- a/crmeb/src/main/java/com/zbkj/crmeb/store/service/impl/StoreProductServiceImpl.java
+++ b/crmeb/src/main/java/com/zbkj/crmeb/store/service/impl/StoreProductServiceImpl.java
@@ -398,7 +398,7 @@ public class StoreProductServiceImpl extends ServiceImpl<StoreProductDao, StoreP
         // 对attr表做全量更新，删除原有数据保存现有数据
         attrService.removeByProductId(storeProduct.getId());
         storeProductAttrValueService.removeByProductId(storeProduct.getId());
-        if(storeProductRequest.getSpecType()) { // todo 确认单属性商品的attr参数
+        if(storeProductRequest.getSpecType()) {
             storeProductRequest.getAttr().forEach(e->{
                 e.setProductId(storeProductRequest.getId());
                 e.setAttrValues(StringUtils.strip(e.getAttrValues().replace("\"",""),"[]"));
@@ -421,9 +421,8 @@ public class StoreProductServiceImpl extends ServiceImpl<StoreProductDao, StoreP
                         }
                         spav.setSuk(String.join(",",skuList));
                     }
-//                    HashMap<String, Object> attrValues = setAttrValueByRequest(storeProductRequest);
-                spav.setAttrValue(JSON.toJSONString(attrValuesRequest.getAttrValue()));
-//                    spav.setAttrValue(JSON.toJSONString(attrValues));
+                    spav.setAttrValue(JSON.toJSONString(attrValuesRequest.getAttrValue()));
+                    spav.setImage(systemAttachmentService.clearPrefix(spav.getImage()));
                     storeProductAttrValues.add(spav);
                 }
                 boolean saveOrUpdateResult = storeProductAttrValueService.saveOrUpdateBatch(storeProductAttrValues);
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/store/utilService/OrderUtils.java b/crmeb/src/main/java/com/zbkj/crmeb/store/utilService/OrderUtils.java
index 6b62d42e..07028994 100644
--- a/crmeb/src/main/java/com/zbkj/crmeb/store/utilService/OrderUtils.java
+++ b/crmeb/src/main/java/com/zbkj/crmeb/store/utilService/OrderUtils.java
@@ -920,9 +920,10 @@ public class OrderUtils {
                 queryWrapper.eq(StoreOrder::getPaid, true);
                 queryWrapper.eq(StoreOrder::getStatus, 2);
                 break;
-            case Constants.ORDER_STATUS_H5_REFUND: // 退款
+            case Constants.ORDER_STATUS_H5_REFUND: // 包含已退款和退款中
                 queryWrapper.eq(StoreOrder::getPaid, true);
-                queryWrapper.in(StoreOrder::getRefundStatus, "1,2"); //大于0
+                queryWrapper.in(StoreOrder::getStatus,-1,-2);
+                queryWrapper.in(StoreOrder::getRefundStatus, 1,2);
                 break;
         }
         queryWrapper.eq(StoreOrder::getIsDel, false);
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/system/service/impl/SystemCityServiceImpl.java b/crmeb/src/main/java/com/zbkj/crmeb/system/service/impl/SystemCityServiceImpl.java
index e5b12adf..b7710e1d 100644
--- a/crmeb/src/main/java/com/zbkj/crmeb/system/service/impl/SystemCityServiceImpl.java
+++ b/crmeb/src/main/java/com/zbkj/crmeb/system/service/impl/SystemCityServiceImpl.java
@@ -73,7 +73,6 @@ public class SystemCityServiceImpl extends ServiceImpl<SystemCityDao, SystemCity
         lambdaQueryWrapper.in(SystemCity::getIsShow, true);
         return dao.selectList(lambdaQueryWrapper);
     }
-
     /**
      * 修改状态
      * @param id integer id
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/system/service/impl/SystemConfigServiceImpl.java b/crmeb/src/main/java/com/zbkj/crmeb/system/service/impl/SystemConfigServiceImpl.java
index acebe869..6935a3a7 100644
--- a/crmeb/src/main/java/com/zbkj/crmeb/system/service/impl/SystemConfigServiceImpl.java
+++ b/crmeb/src/main/java/com/zbkj/crmeb/system/service/impl/SystemConfigServiceImpl.java
@@ -150,7 +150,6 @@ public class SystemConfigServiceImpl extends ServiceImpl<SystemConfigDao, System
         //修改之前的数据
         updateStatusByFormId(systemFormCheckRequest.getId());
 
-        //批量插入
         saveBatch(systemConfigList);
 
         //删除之前隐藏的数据