From 679207521de8f216787dcc7be743c362a8d46bc4 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Mon, 24 Nov 2025 15:48:06 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E9=83=A8=E5=88=86=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=8C=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/my-components/edit-discount.vue    | 384 +++++----
 data/index.js                                 |  33 +
 http/api/account/tableOrderStatistic.js       |  13 +
 http/api/order/summary.js                     |  23 +
 http/http.js                                  |   4 +-
 main.js                                       |   3 +
 pageBwc/index/index.vue                       |   5 +-
 pageMarket/distribution/components/config.vue |   2 +-
 pageMarket/distribution/level-list.vue        |   8 +-
 pageMarket/newUserDiscount/index.vue          |   7 +-
 .../components/my-date-pickerview.vue         | 807 ++++++++---------
 pageSalesSummary/index.vue                    | 749 ++++++++--------
 pageSalesSummary/productSalesRanking.vue      | 269 +++---
 pageSalesSummary/table.vue                    | 346 ++++++++
 pages.json                                    |  11 +-
 pages/appliccation/marketing.vue              |   2 +-
 pages/index/components/Stats.vue              | 546 ++++++------
 pages/index/components/my-date-pickerview.vue | 810 +++++++++---------
 pages/index/components/statistics.vue         | 720 ++++++++--------
 pages/login/index.vue                         |   2 +
 20 files changed, 2610 insertions(+), 2134 deletions(-)
 create mode 100644 data/index.js
 create mode 100644 http/api/account/tableOrderStatistic.js
 create mode 100644 http/api/order/summary.js
 create mode 100644 pageSalesSummary/table.vue

diff --git a/components/my-components/edit-discount.vue b/components/my-components/edit-discount.vue
index c34851f..bd8614e 100644
--- a/components/my-components/edit-discount.vue
+++ b/components/my-components/edit-discount.vue
@@ -1,201 +1,223 @@
 <template>
-	<my-model ref="model" :title="title" iconColor="#000" @close="resetForm">
-		<template #desc>
-			<view class="u-text-left u-p-30 color-666">
-				<view class="u-m-t-32 u-flex ">
-					<view>应付金额</view>
-					<view class="u-m-l-32">
-						{{form.price}}
-					</view>
-				</view>
-				<view class="u-m-t-40 u-flex ">
-					<view>实收金额</view>
-					<view class="u-m-l-32 border u-p-l-10 u-p-r-10 u-flex-1">
-						<uni-easyinput type="number"  @input="currentPriceInput" @change="currentPriceChange" paddingNone :inputBorder="false" 
-						v-model="form.currentPrice"
-							placeholder="输入实际金额"></uni-easyinput>
-					</view>
-				</view>
-				<view class="u-m-t-54 u-flex ">
-					<view>优惠折扣</view>
-					<view class="u-m-l-32 u-flex-1 u-flex border u-p-l-10 u-p-r-10">
-						<view class="u-flex-1">
-							<uni-easyinput type="number" @input="discountInput"  @change="discountChange" paddingNone :inputBorder="false" 
-							v-model="form.discount"
-								placeholder="输入折扣"></uni-easyinput>
-						</view>
-						<view class="u-font-32 color-333">%</view>
-					</view>
-					
-				</view>
-			</view>
-		</template>
-		<template #btn>
-			<view class="u-p-30">
-				<view class="u-m-t-10">
-					<my-button @tap="confirm" shape="circle" fontWeight="700" >修改</my-button>
-					<view class="">
-						<my-button @tap="close" type="cancel" bgColor="#fff" >取消</my-button>
-					</view>
-				</view>
-			</view>
-		</template>
-	</my-model>
+  <my-model ref="model" :title="title" iconColor="#000" @close="resetForm">
+    <template #desc>
+      <view class="u-text-left u-p-30 color-666">
+        <view class="u-m-t-32 u-flex">
+          <view>应付金额</view>
+          <view class="u-m-l-32">
+            {{ form.price }}
+          </view>
+        </view>
+        <view class="u-m-t-40 u-flex">
+          <view>实收金额</view>
+          <view class="u-m-l-32 border u-p-l-10 u-p-r-10 u-flex-1">
+            <uni-easyinput
+              type="number"
+              @input="currentPriceInput"
+              @change="currentPriceChange"
+              paddingNone
+              :inputBorder="false"
+              v-model="form.currentPrice"
+              placeholder="输入实际金额"
+            ></uni-easyinput>
+          </view>
+        </view>
+        <view class="u-m-t-54 u-flex">
+          <view>优惠折扣</view>
+          <view class="u-m-l-32 u-flex-1 u-flex border u-p-l-10 u-p-r-10">
+            <view class="u-flex-1">
+              <uni-easyinput
+                type="number"
+                @input="discountInput"
+                @change="discountChange"
+                paddingNone
+                :inputBorder="false"
+                v-model="form.discount"
+                placeholder="输入折扣"
+              ></uni-easyinput>
+            </view>
+            <view class="u-font-32 color-333">%</view>
+          </view>
+        </view>
+      </view>
+    </template>
+    <template #btn>
+      <view class="u-p-30">
+        <view class="u-m-t-10">
+          <my-button @tap="confirm" shape="circle" fontWeight="700"
+            >修改</my-button
+          >
+          <view class="">
+            <my-button @tap="close" type="cancel" bgColor="#fff"
+              >取消</my-button
+            >
+          </view>
+        </view>
+      </view>
+    </template>
+  </my-model>
 </template>
 
 <script setup>
-	import { reactive, nextTick, ref,watch } from 'vue';
-	import myModel from '@/components/my-components/my-model.vue'
-	import myButton from '@/components/my-components/my-button.vue'
-	import infoBox from '@/commons/utils/infoBox.js'
-	const props = defineProps({
-		title: {
-			type: String,
-			default: ''
-		},
-		discount:{
-			type: [Number,String],
-			default:100
-		},
-		price: {
-			type: [Number,String],
-			default: 0
-		},
-		
-	})
-	function currentPriceInput(newval){
-		form.discount = (newval*100/form.price).toFixed(2)
-	}
-	function discountInput(newval){
-		form.currentPrice= uni.$utils.isMoney(form.price*newval/100).toFixed(2)
-	}
-	function currentPriceChange(newval){
-		if(newval<0){
-			form.currentPrice = '0.00'
-			form.discount=100
-			return infoBox.showToast('实收金额不能小于0')
-		}
-		console.log(props.price)
-		console.log(newval)
-		if(newval > props.price){
-			form.currentPrice = (uni.$utils.isMoney(props.price)*1).toFixed(2)
-			form.discount=0
-			return infoBox.showToast('实收金额不能大于应付金额')
-		}
-	}
-	function discountChange(newval){
-		if(newval<0){
-			form.currentPrice=props.price
-			form.discount=0
-			return infoBox.showToast('优惠折扣不能小于0')
-		}
-		if(newval>100){
-			form.discount=100
-			form.currentPrice=0
-			return infoBox.showToast('优惠折扣不能大于100')
-		}
-	}
-	
-	const $form = {
-		price: props.price,
-		currentPrice: props.price,
-		discount: 100
-	}
-	const form = reactive({
-		...$form
-	})
-	watch(()=>props.price,(newval)=>{
-		form.price = (newval*1).toFixed(2)
-		form.currentPrice=newval
-	})
-	function resetForm() {
-		Object.assign(form, {
-			...$form
-		})
-	}
+import { reactive, nextTick, ref, watch } from "vue";
+import myModel from "@/components/my-components/my-model.vue";
+import myButton from "@/components/my-components/my-button.vue";
+import infoBox from "@/commons/utils/infoBox.js";
+const props = defineProps({
+  title: {
+    type: String,
+    default: "",
+  },
+  discount: {
+    type: [Number, String],
+    default: 100,
+  },
+  price: {
+    type: [Number, String],
+    default: 0,
+  },
+});
+function currentPriceInput(newval) {
+  form.discount = ((newval * 100) / form.price).toFixed(2);
+}
+function discountInput(newval) {
+  const currentPrice = uni.$utils.isMoney((form.price * newval) / 100) * 1;
+  form.currentPrice = currentPrice.toFixed(2);
+}
+function currentPriceChange(newval) {
+  if (newval < 0) {
+    form.currentPrice = "0.00";
+    form.discount = 100;
+    return infoBox.showToast("实收金额不能小于0");
+  }
+  console.log(props.price);
+  console.log(newval);
+  if (newval > props.price) {
+    const currentPrice = uni.$utils.isMoney(props.price * 1);
+    form.currentPrice = currentPrice.toFixed(2);
+    form.discount = 0;
+    return infoBox.showToast("实收金额不能大于应付金额");
+  }
+}
+function discountChange(newval) {
+  if (newval < 0) {
+    form.currentPrice = props.price;
+    form.discount = 0;
+    return infoBox.showToast("优惠折扣不能小于0");
+  }
+  if (newval > 100) {
+    form.discount = 100;
+    form.currentPrice = 0;
+    return infoBox.showToast("优惠折扣不能大于100");
+  }
+}
 
-	const model = ref(null)
+const $form = {
+  price: props.price,
+  currentPrice: props.price,
+  discount: 100,
+};
+const form = reactive({
+  ...$form,
+});
+watch(
+  () => props.price,
+  (newval) => {
+    form.price = (newval * 1).toFixed(2);
+    form.currentPrice = newval;
+  }
+);
+function resetForm() {
+  Object.assign(form, {
+    ...$form,
+  });
+}
 
-	function open() {
-		model.value.open()
-		form.price= (props.price*1).toFixed(2)
-		form.discount=props.discount
-		form.currentPrice=(props.discount*props.price/100).toFixed(2)
-		console.log(form)
-	}
+const model = ref(null);
 
-	function close() {
-		model.value.close()
-	}
-	const emits = defineEmits(['confirm'])
+function open() {
+  model.value.open();
+  form.price = (props.price * 1).toFixed(2);
+  form.discount = props.discount;
+  form.currentPrice = ((props.discount * props.price) / 100).toFixed(2);
+  console.log(form);
+}
 
-	function confirm() {
-		emits('confirm',{...form,currentPrice:Number(form.currentPrice).toFixed(2)})
-		close()
-	}
-	defineExpose({
-		open,
-		close
-	})
+function close() {
+  model.value.close();
+}
+const emits = defineEmits(["confirm"]);
+
+function confirm() {
+  emits("confirm", {
+    ...form,
+    currentPrice: Number(form.currentPrice).toFixed(2),
+  });
+  close();
+}
+defineExpose({
+  open,
+  close,
+});
 </script>
 
 <style lang="scss" scoped>
-	.border{
-		border-radius: 8rpx;
-		overflow: hidden;
-		border-color: #999;
-	}
-	.lh34 {
-		line-height: 34rpx;
-	}
+.border {
+  border-radius: 8rpx;
+  overflow: hidden;
+  border-color: #999;
+}
+.lh34 {
+  line-height: 34rpx;
+}
 
-	.tag {
-		background-color: #fff;
-		border: 1px solid #E5E5E5;
-		line-height: inherit;
-		font-size: 24rpx;
-		color: #666666;
-		padding: 6rpx 20rpx;
-		border-radius: 8rpx;
+.tag {
+  background-color: #fff;
+  border: 1px solid #e5e5e5;
+  line-height: inherit;
+  font-size: 24rpx;
+  color: #666666;
+  padding: 6rpx 20rpx;
+  border-radius: 8rpx;
 
-		&.active {
-			border-color: #E6F0FF;
-			color: $my-main-color;
-		}
-	}
+  &.active {
+    border-color: #e6f0ff;
+    color: $my-main-color;
+  }
+}
 
-	.hover-class {
-		background-color: #E5E5E5;
-	}
+.hover-class {
+  background-color: #e5e5e5;
+}
 
-	.discount {
-		.u-absolute {
-			top: 0;
-			bottom: 0;
-			right: 0;
-		}
-	}
+.discount {
+  .u-absolute {
+    top: 0;
+    bottom: 0;
+    right: 0;
+  }
+}
 
-	.bg1 {
-		background: #F7F7FA;
-	}
+.bg1 {
+  background: #f7f7fa;
+}
 
-	.tab {
-		padding: 0 80rpx;
-	}
+.tab {
+  padding: 0 80rpx;
+}
 
-	.border {
-		border: 1px solid #E5E5E5;
-		border-radius: 4rpx;
-	}
+.border {
+  border: 1px solid #e5e5e5;
+  border-radius: 4rpx;
+}
 
-	.input-box {
-		padding: 22rpx 32rpx;
-		font-size: 28rpx;
-		color: #666;
-	}
+.input-box {
+  padding: 22rpx 32rpx;
+  font-size: 28rpx;
+  color: #666;
+}
 
-	.placeholder-class {
-		font-size: 28rpx;
-	}
-</style>
\ No newline at end of file
+.placeholder-class {
+  font-size: 28rpx;
+}
+</style>
diff --git a/data/index.js b/data/index.js
new file mode 100644
index 0000000..f80dc5b
--- /dev/null
+++ b/data/index.js
@@ -0,0 +1,33 @@
+import dayjs from "dayjs";
+export const timeList = [
+  {
+    label: "今天",
+    value: "today",
+    beginDate: dayjs().format("YYYY-MM-DD"),
+    endDate: dayjs().format("YYYY-MM-DD"),
+  },
+  {
+    label: "昨天",
+    value: "yesterday",
+    beginDate: dayjs().subtract(1, "day").format("YYYY-MM-DD"),
+    endDate: dayjs().subtract(1, "day").format("YYYY-MM-DD"),
+  },
+  {
+    label: "本周",
+    value: "this_week",
+    beginDate: dayjs().startOf("week").format("YYYY-MM-DD"),
+    endDate: dayjs().endOf("week").format("YYYY-MM-DD"),
+  },
+  {
+    label: "本月",
+    value: "this_month",
+    beginDate: dayjs().startOf("month").format("YYYY-MM-DD"),
+    endDate: dayjs().endOf("month").format("YYYY-MM-DD"),
+  },
+  {
+    label: "自定义",
+    value: "custom",
+    beginDate: "",
+    endDate: "",
+  },
+];
diff --git a/http/api/account/tableOrderStatistic.js b/http/api/account/tableOrderStatistic.js
new file mode 100644
index 0000000..1f1e882
--- /dev/null
+++ b/http/api/account/tableOrderStatistic.js
@@ -0,0 +1,13 @@
+import http from "@/http/http.js";
+const request = http.request;
+const urlType = "account";
+
+export function tableOrderStatistic(data) {
+  return request({
+    url: `${urlType}/admin/tableOrderStatistic`,
+    method: "GET",
+    data: {
+      ...data,
+    },
+  });
+}
\ No newline at end of file
diff --git a/http/api/order/summary.js b/http/api/order/summary.js
new file mode 100644
index 0000000..285125a
--- /dev/null
+++ b/http/api/order/summary.js
@@ -0,0 +1,23 @@
+import http from "@/http/http.js";
+const request = http.request;
+const urlType = "order";
+
+export function tableSummaryList(data) {
+  return request({
+    url: `${urlType}/admin/table/summary/list`,
+    method: "GET",
+    data: {
+      ...data,
+    },
+  });
+}
+
+export function saleSummaryPage(data) {
+    return request({
+      url: `${urlType}/admin/sale/summary/page`,
+      method: "GET",
+      data: {
+        ...data,
+      },
+    });
+  }
\ No newline at end of file
diff --git a/http/http.js b/http/http.js
index 3059424..6fceecc 100644
--- a/http/http.js
+++ b/http/http.js
@@ -15,8 +15,8 @@ import infoBox from "@/commons/utils/infoBox.js";
 import go from "@/commons/utils/go.js";
 import { reject } from "lodash";
 // 设置node环境
-// envConfig.changeEnv(storageManage.env('production'))
-envConfig.changeEnv(storageManage.env("development"));
+// envConfig.changeEnv(storageManage.env('production')) //正式
+envConfig.changeEnv(storageManage.env("development")); //测试
 
 // 测试服
 // #ifdef H5
diff --git a/main.js b/main.js
index ccd5728..2ac4d0a 100644
--- a/main.js
+++ b/main.js
@@ -10,6 +10,9 @@ import * as Pinia from 'pinia';
 import {
 	createUnistorage
 } from "pinia-plugin-unistorage";
+
+uni.$utils=utils
+
 // 设置node环境
 envConfig.changeEnv(storageManage.env())
 
diff --git a/pageBwc/index/index.vue b/pageBwc/index/index.vue
index 968b9b6..ae13880 100644
--- a/pageBwc/index/index.vue
+++ b/pageBwc/index/index.vue
@@ -7,7 +7,10 @@
 					<view class="color-333 font-bold">霸王餐</view>
 					<view class="color-666 u-m-t-4 u-font-24">设置充值消费的N倍，当前订单立即免单</view>
 				</view>
-				<up-switch v-model="form.enable" size="18"></up-switch>
+				<up-switch v-model="form.enable" size="18" 
+        :active-value="1"
+        :inactive-value="0"
+        ></up-switch>
 			</view>
 		</view>
 		<view class="boxconstantbox"
diff --git a/pageMarket/distribution/components/config.vue b/pageMarket/distribution/components/config.vue
index 1cde388..ba6ba35 100644
--- a/pageMarket/distribution/components/config.vue
+++ b/pageMarket/distribution/components/config.vue
@@ -66,7 +66,7 @@
               class="number-box"
               placeholder="请输入"
               placeholder-class="color-999 u-font-28"
-              type="number"
+              type="digit"
               
               v-model="form.payAmount"
             />
diff --git a/pageMarket/distribution/level-list.vue b/pageMarket/distribution/level-list.vue
index 2a61107..3c47c5b 100644
--- a/pageMarket/distribution/level-list.vue
+++ b/pageMarket/distribution/level-list.vue
@@ -271,7 +271,13 @@ function cancel(){
 }
 onLoad(()=>{
     showDetailListSwitch.value=distributionStore.config.levelConfigList.map(()=>true)
-    form.levelConfigList=[...distributionStore.config.levelConfigList||[]]
+    const levelConfigList=[...distributionStore.config.levelConfigList||[]]
+    form.levelConfigList=levelConfigList.length?levelConfigList:[
+    {   name:'',
+        levelOneCommission:'',
+        inviteCount:'',
+        costAmount:''}
+    ]
     form.upgradeType=distributionStore.config.upgradeType
 })
 </script>
diff --git a/pageMarket/newUserDiscount/index.vue b/pageMarket/newUserDiscount/index.vue
index 6233117..8f0bb2b 100644
--- a/pageMarket/newUserDiscount/index.vue
+++ b/pageMarket/newUserDiscount/index.vue
@@ -157,7 +157,7 @@
 <script setup>
 import Modal from "@/pageMarket/components/modal.vue";
 
-import { ref, reactive, computed, watch, onMounted } from "vue";
+import { ref, reactive, computed, watch, onMounted ,nextTick} from "vue";
 import { useNewUserDiscountStore } from "@/store/market.js";
 
 const isLoading = ref(false);
@@ -299,7 +299,10 @@ async function init() {
   };
   console.log(data);
   Object.assign(form, data);
-  isLoading.value = false;
+  nextTick(() => {
+    isLoading.value = false;
+
+  })
 }
 
 onMounted(() => {
diff --git a/pageSalesSummary/components/my-date-pickerview.vue b/pageSalesSummary/components/my-date-pickerview.vue
index e8718c2..af1370b 100644
--- a/pageSalesSummary/components/my-date-pickerview.vue
+++ b/pageSalesSummary/components/my-date-pickerview.vue
@@ -1,30 +1,40 @@
 <template>
-	<view class="mask" v-if="show" @tap="close">
-		<view class="box" @tap.stop="nullFunction">
-			<view class="u-flex u-relative u-row-center u-p-30 top">
-				<view class="font-bold u-font-32">筛选日期时间</view>
-				<view class="close" @tap="close">
-					<uni-icons type="closeempty" size="24"></uni-icons>
-				</view>
-
-			</view>
-			<!-- 	<view class="u-p-30 u-flex u-flex-wrap gap-20 fastTime">
+  <view class="mask" v-if="show" @tap="close">
+    <view class="box" @tap.stop="nullFunction">
+      <view class="u-flex u-relative u-row-center u-p-30 top">
+        <view class="font-bold u-font-32">筛选日期时间</view>
+        <view class="close" @tap="close">
+          <uni-icons type="closeempty" size="24"></uni-icons>
+        </view>
+      </view>
+      <!-- 	<view class="u-p-30 u-flex u-flex-wrap gap-20 fastTime">
 					<view class="item" v-for="(item,index) in fastTime" :key="index" @tap="changeTime(item.key)">
 						{{item.title}}
 					</view>
 				</view> -->
-			<picker-view :immediate-change="true" @pickend="pickend" :value="value" @change="bindChange"
-				class="picker-view">
-				<picker-view-column>
-					<view class="item" v-for="(item,index) in years" :key="index">{{item}}年</view>
-				</picker-view-column>
-				<picker-view-column>
-					<view class="item" v-for="(item,index) in months" :key="index">{{item}}月</view>
-				</picker-view-column>
-				<picker-view-column>
-					<view class="item" v-for="(item,index) in days" :key="index">{{item}}日</view>
-				</picker-view-column>
-	<!-- 			<picker-view-column>
+      <picker-view
+        :immediate-change="true"
+        @pickend="pickend"
+        :value="value"
+        @change="bindChange"
+        class="picker-view"
+      >
+        <picker-view-column>
+          <view class="item" v-for="(item, index) in years" :key="index"
+            >{{ item }}年</view
+          >
+        </picker-view-column>
+        <picker-view-column>
+          <view class="item" v-for="(item, index) in months" :key="index"
+            >{{ item }}月</view
+          >
+        </picker-view-column>
+        <picker-view-column>
+          <view class="item" v-for="(item, index) in days" :key="index"
+            >{{ item }}日</view
+          >
+        </picker-view-column>
+        <!-- 			<picker-view-column>
 					<view class="item" v-for="(item,index) in hours" :key="index">{{item}}时</view>
 				</picker-view-column>
 				<picker-view-column>
@@ -33,20 +43,31 @@
 				<picker-view-column>
 					<view class="item" v-for="(item,index) in seconds" :key="index">{{item}}秒</view>
 				</picker-view-column> -->
-			</picker-view>
-			<view class="u-text-center color-999">至</view>
-			<picker-view :immediate-change="true" :value="value1" @pickend="pickend1" @change="bindChange1"
-				class="picker-view">
-				<picker-view-column>
-					<view class="item" v-for="(item,index) in years" :key="index">{{item}}年</view>
-				</picker-view-column>
-				<picker-view-column>
-					<view class="item" v-for="(item,index) in months" :key="index">{{item}}月</view>
-				</picker-view-column>
-				<picker-view-column>
-					<view class="item" v-for="(item,index) in days1" :key="index">{{item}}日</view>
-				</picker-view-column>
-		<!-- 		<picker-view-column>
+      </picker-view>
+      <view class="u-text-center color-999">至</view>
+      <picker-view
+        :immediate-change="true"
+        :value="value1"
+        @pickend="pickend1"
+        @change="bindChange1"
+        class="picker-view"
+      >
+        <picker-view-column>
+          <view class="item" v-for="(item, index) in years" :key="index"
+            >{{ item }}年</view
+          >
+        </picker-view-column>
+        <picker-view-column>
+          <view class="item" v-for="(item, index) in months" :key="index"
+            >{{ item }}月</view
+          >
+        </picker-view-column>
+        <picker-view-column>
+          <view class="item" v-for="(item, index) in days1" :key="index"
+            >{{ item }}日</view
+          >
+        </picker-view-column>
+        <!-- 		<picker-view-column>
 					<view class="item" v-for="(item,index) in hours" :key="index">{{item}}时</view>
 				</picker-view-column>
 				<picker-view-column>
@@ -55,394 +76,402 @@
 				<picker-view-column>
 					<view class="item" v-for="(item,index) in seconds" :key="index">{{item}}秒</view>
 				</picker-view-column> -->
-			</picker-view>
-
-			<!-- 站位 -->
-			<view style="height: 80px;"></view>
-			<view class="fixed_b">
-				<my-button shape="circle" @tap="confirm">确定</my-button>
-			</view>
-		</view>
-
-	</view>
+      </picker-view>
 
+      <!-- 站位 -->
+      <view style="height: 80px"></view>
+      <view class="fixed_b">
+        <my-button shape="circle" @tap="confirm">确定</my-button>
+      </view>
+    </view>
+  </view>
 </template>
 
 <script setup>
-	import myButton from "@/components/my-components/my-button.vue"
-	import {
-		reactive,
-		ref
-	} from 'vue';
-	const $nowDate = new Date()
-	const nowDate = {
-		year: $nowDate.getFullYear(),
-		month: $nowDate.getMonth() + 1,
-		day: $nowDate.getDate(),
-		hours: $nowDate.getHours(),
-		minutes: $nowDate.getMinutes(),
-		seconds: $nowDate.getSeconds()
-	}
-	const yearsLen = 30
-	const years = new Array(yearsLen).fill(1).map((v, index) => {
-		return nowDate.year - index
-	}).reverse()
-	const months = new Array(12).fill(1).map((v, index) => {
-		return index + 1
-	})
-	const days = ref(new Array(getMonthArea($nowDate, 'end').getDate()).fill(1).map((v, index) => {
-		return index + 1
-	}))
-	const days1 = ref(new Array(getMonthArea($nowDate, 'end').getDate()).fill(1).map((v, index) => {
-		return index + 1
-	}))
-	const hours = new Array(24).fill(1).map((v, index) => {
-		return index
-	})
-	const minutes = new Array(60).fill(1).map((v, index) => {
-		return index
-	})
-	const seconds = new Array(60).fill(1).map((v, index) => {
-		return index
-	})
-	const fastTime = reactive([{
-			title: '今日',
-			key: 'now'
-		},
-		{
-			title: '昨日',
-			key: 'prve'
-		},
-		{
-			title: '本月',
-			key: 'nowMonth'
-		},
-		{
-			title: '上月',
-			key: 'prveMonth'
-		}
-	])
+import dayjs from "dayjs";
+import myButton from "@/components/my-components/my-button.vue";
+import { reactive, ref } from "vue";
+const $nowDate = new Date();
+const nowDate = {
+  year: $nowDate.getFullYear(),
+  month: $nowDate.getMonth() + 1,
+  day: $nowDate.getDate(),
+  hours: $nowDate.getHours(),
+  minutes: $nowDate.getMinutes(),
+  seconds: $nowDate.getSeconds(),
+};
+const yearsLen = 30;
+const years = new Array(yearsLen)
+  .fill(1)
+  .map((v, index) => {
+    return nowDate.year - index;
+  })
+  .reverse();
+const months = new Array(12).fill(1).map((v, index) => {
+  return index + 1;
+});
+const days = ref(
+  new Array(getMonthArea($nowDate, "end").getDate()).fill(1).map((v, index) => {
+    return index + 1;
+  })
+);
+const days1 = ref(
+  new Array(getMonthArea($nowDate, "end").getDate()).fill(1).map((v, index) => {
+    return index + 1;
+  })
+);
+const hours = new Array(24).fill(1).map((v, index) => {
+  return index;
+});
+const minutes = new Array(60).fill(1).map((v, index) => {
+  return index;
+});
+const seconds = new Array(60).fill(1).map((v, index) => {
+  return index;
+});
+const fastTime = reactive([
+  {
+    title: "今日",
+    key: "now",
+  },
+  {
+    title: "昨日",
+    key: "prve",
+  },
+  {
+    title: "本月",
+    key: "nowMonth",
+  },
+  {
+    title: "上月",
+    key: "prveMonth",
+  },
+]);
 
+function setPrveDay() {}
 
+function setNowMoneth() {}
 
-	function setPrveDay() {
+function setprveMoneth() {}
 
-	}
+function setDay(start, end) {
+  value.value = [start.year, start.month, start.day, 0, 0, 0];
+  value1.value = [end.year, end.month, end.day, 23, 59, 59];
+}
 
-	function setNowMoneth() {
+function changeTime(key) {
+  const yearIndex = years.findIndex((v) => v == nowDate.year);
+  const prveyearIndex = years.findIndex((v) => v == nowDate.year) - 1;
+  const nowMonthIndex = nowDate.month - 1;
+  const nowDayIndex = nowDate.day - 1;
+  const dataMap = {
+    now: function () {
+      return {
+        start: {
+          year: yearIndex,
+          month: nowMonthIndex,
+          day: nowDayIndex,
+        },
+        end: {
+          year: yearIndex,
+          month: nowMonthIndex,
+          day: nowDayIndex,
+        },
+      };
+    },
+    prve: function () {
+      const oneDay = 1000 * 60 * 60 * 24;
+      const date = new Date(
+        new Date(nowDate.year, nowDate.month, nowDate.day, 0, 0, 0).getTime() -
+          oneDay
+      );
+      return {
+        start: {
+          year: years.findIndex((v) => v == date.getFullYear()),
+          month: date.getMonth() - 1 < 0 ? 11 : date.getMonth() - 1,
+          day: date.getDate() - 1,
+        },
+        end: {
+          year: years.findIndex((v) => v == date.getFullYear()),
+          month: date.getMonth() - 1 < 0 ? 11 : date.getMonth() - 1,
+          day: date.getDate() - 1,
+        },
+      };
+    },
+    nowMonth: function () {
+      return {
+        start: {
+          year: yearIndex,
+          month: nowMonthIndex,
+          day: 0,
+        },
+        end: {
+          year: yearIndex,
+          month: nowMonthIndex,
+          day: new Date(nowDate.year, nowDate.month, 0).getDate() - 1,
+        },
+      };
+    },
+    prveMonth: function () {
+      const oneDay = 1000 * 60 * 60 * 24;
+      const date = new Date(
+        new Date(nowDate.year, nowDate.month - 1, 0, 0, 0).getTime() - oneDay
+      );
+      console.log(date.getMonth());
+      return {
+        start: {
+          year: years.findIndex((v) => v == date.getFullYear()),
+          month: date.getMonth(),
+          day: 0,
+        },
+        end: {
+          year: years.findIndex((v) => v == date.getFullYear()),
+          month: date.getMonth(),
+          day: date.getDate(),
+        },
+      };
+    },
+  };
+  const data = dataMap[key]();
+  setDay(data.start, data.end);
+  changeDays(false, value.value);
+  changeDays(true, value1.value);
 
-	}
+  console.log(value1.value);
+  const start = returnDateString(value.value);
+  const end = returnDateString(value1.value);
 
-	function setprveMoneth() {
+  emits("confirm", {
+    text: `${start}——${end}`,
+    start,
+    end,
+  });
+  close();
+}
+let value = ref([
+  years.length - 1,
+  nowDate.month - 1,
+  nowDate.day - 1,
+  0,
+  0,
+  0,
+]);
+let value1 = ref([
+  years.length - 1,
+  nowDate.month - 1,
+  nowDate.day - 1,
+  23,
+  59,
+  59,
+]);
 
-	}
+let show = ref(false);
+const emits = defineEmits("close", "open", "confirm");
 
+function toggle() {
+  show.value = !show.value;
+  if (show.value) {
+    emits("open", true);
+  } else {
+    emits("close", false);
+  }
+}
 
-	function setDay(start, end) {
-		value.value = [
-			start.year,
-			start.month,
-			start.day,
-			0,
-			0,
-			0,
-		]
-		value1.value = [
-			end.year,
-			end.month,
-			end.day,
-			23,
-			59,
-			59,
-		]
-	}
+function close() {
+  show.value = false;
+  emits("close", false);
+}
 
-	function changeTime(key) {
-		const yearIndex = years.findIndex(v => v == nowDate.year)
-		const prveyearIndex = years.findIndex(v => v == nowDate.year) - 1
-		const nowMonthIndex = nowDate.month - 1
-		const nowDayIndex = nowDate.day - 1
-		const dataMap = {
-			now: function() {
-				return {
-					start: {
-						year: yearIndex,
-						month: nowMonthIndex,
-						day: nowDayIndex
-					},
-					end: {
-						year: yearIndex,
-						month: nowMonthIndex,
-						day: nowDayIndex
-					}
-				}
-			},
-			prve: function() {
-				const oneDay=1000*60*60*24
-				const date=new Date(new Date(nowDate.year,nowDate.month,nowDate.day,0,0,0).getTime()-oneDay) 
-				return {
-					start: {
-						year:years.findIndex(v=>v==date.getFullYear()),
-						month:date.getMonth()-1<0?11:date.getMonth()-1,
-						day: date.getDate()-1
-					},
-					end: {
-						year:years.findIndex(v=>v==date.getFullYear()),
-						month:date.getMonth()-1<0?11:date.getMonth()-1,
-						day: date.getDate()-1
-					}
-				}
-			},
-			nowMonth: function() {
-				return {
-					start: {
-						year:yearIndex,
-						month:nowMonthIndex,
-						day: 0
-					},
-					end: {
-						year:yearIndex,
-						month:nowMonthIndex,
-						day:new Date(nowDate.year, nowDate.month , 0).getDate() - 1
-					}
-				}
-			},
-			prveMonth: function() {
-				const oneDay=1000*60*60*24
-				const date=new Date(new Date(nowDate.year, nowDate.month-1,0,0,0).getTime()-oneDay) 
-				console.log(date.getMonth());
-				return {
-					start: {
-						year:years.findIndex(v=>v==date.getFullYear()),
-						month:date.getMonth(),
-						day: 0
-					},
-					end: {
-						year:years.findIndex(v=>v==date.getFullYear()),
-						month:date.getMonth(),
-						day: date.getDate()
-					}
-				}
-			}
-		}
-		const data = dataMap[key]()
-		setDay(data.start, data.end)
-		changeDays(false,value.value)
-		changeDays(true,value1.value)
-		
-		console.log(value1.value);
-		const start = returnDateString(value.value)
-		const end = returnDateString(value1.value)
-		
-		emits('confirm', {
-			text: `${start}——${end}`,
-			start,
-			end
-		})
-		close()
-	}
-	let value = ref([
-		years.length - 1,
-		nowDate.month - 1,
-		nowDate.day - 1,
-		0,
-		0,
-		0,
-	])
-	let value1 = ref([
-		years.length - 1,
-		nowDate.month - 1,
-		nowDate.day - 1,
-		23,
-		59,
-		59,
-	])
+function open() {
+  show.value = true;
+  emits("open", true);
+}
 
-	let show = ref(false)
-	const emits = defineEmits('close', 'open', 'confirm')
+function returnDateString(arr) {
+  const year = years[arr[0]];
+  const month = ("0" + (arr[1] + 1)).slice(-2);
+  const day = ("0" + (arr[2] + 1)).slice(-2);
+  const hour = ("0" + arr[3]).slice(-2);
+  const min = ("0" + arr[4]).slice(-2);
+  const sen = ("0" + arr[5]).slice(-2);
 
-	function toggle() {
-		show.value = !show.value
-		if (show.value) {
-			emits('open', true)
-		} else {
-			emits('close', false)
-		}
-	}
+  return `${year}-${month}-${day} ${hour}:${min}:${sen}`;
+}
 
-	function close() {
-		show.value = false
-		emits('close', false)
-	}
+function confirm(e) {
+  const start = returnDateString(value.value);
+  const end = returnDateString(value1.value);
+  console.log(start);
+  console.log(end);
+  //如果结尾时间小于开始时间
+  if (new Date(start).getTime() > new Date(end).getTime()) {
+    return uni.showToast({
+      title: "结束时间不能小于开始时间",
+      icon: "none",
+    });
+  }
+  emits("confirm", {
+    text: `${start}——${end}`,
+    start,
+    end,
+  });
+  close();
+}
 
-	function open() {
-		show.value = true
-		emits('open', true)
-	}
+function returnMonthStart(arr) {
+  return new Date(years[arr[0]], months[arr[1]] - 1, 1).getDate();
+}
 
-	function returnDateString(arr) {
-		const year = years[arr[0]]
-		const month = arr[1] + 1
-		const day = arr[2] + 1
-		const hour = ('0' + arr[3]).slice(-2)
-		const min = ('0' + arr[4]).slice(-2)
-		const sen = ('0' + arr[5]).slice(-2)
-		return `${year}-${month}-${day} ${hour}:${min}:${sen}`
-	}
+function returnMonthEnd(arr) {
+  return new Date(years[arr[0]], months[arr[1]], 0).getDate();
+}
 
+function changeDays(isDays1, arr) {
+  const end = returnMonthEnd(arr);
+  if (end) {
+    if (isDays1) {
+      days1.value = new Array(end).fill(1).map((v, index) => {
+        return index + 1;
+      });
+    } else {
+      days.value = new Array(end).fill(1).map((v, index) => {
+        return index + 1;
+      });
+    }
+  }
+}
 
-	function confirm(e) {
-		const start = returnDateString(value.value)
-		const end = returnDateString(value1.value)
-		console.log(start);
-		console.log(end);
-		emits('confirm', {
-			text: `${start}——${end}`,
-			start,
-			end
-		})
-		close()
-	}
+function bindChange(e) {
+  value.value = e.detail.value;
+  changeDays(false, e.detail.value);
+}
 
-	function returnMonthStart(arr) {
-		return new Date(years[arr[0]], months[arr[1]] - 1, 1).getDate();
-	}
+function bindChange1(e) {
+  value1.value = e.detail.value;
+  changeDays(true, e.detail.value);
+}
 
-	function returnMonthEnd(arr) {
-		return new Date(years[arr[0]], months[arr[1]], 0).getDate();
-	}
-	
-	function changeDays(isDays1,arr){
-		const end = returnMonthEnd(arr)
-		if (end) {
-			if(isDays1){
-				days1.value= new Array(end).fill(1).map((v,
-					index) => {
-					return index + 1
-				})
-			}else{
-				days.value= new Array(end).fill(1).map((v,
-					index) => {
-					return index + 1
-				})
-			}
-			
-		}
-	}
+function getDayDate(date = new Date(), type) {
+  const now = date;
+  if (type === "start") {
+    const startOfDay = new Date(
+      now.getFullYear(),
+      now.getMonth(),
+      now.getDate()
+    );
+    return startOfDay;
+  }
+  if (type === "end") {
+    const endOfDay = new Date(
+      now.getFullYear(),
+      now.getMonth(),
+      now.getDate(),
+      23,
+      59,
+      59,
+      999
+    );
+    return endOfDay;
+  }
+}
 
-	function bindChange(e) {
-		value.value = e.detail.value
-		changeDays(false, e.detail.value)
-	}
+function getMonthArea(date = new Date(), type) {
+  let now = date;
+  let currentMonthStart = new Date(now.getFullYear(), now.getMonth(), 1);
+  let currentMonthEnd = new Date(
+    now.getFullYear(),
+    now.getMonth() + 1,
+    0,
+    23,
+    59,
+    59,
+    999
+  );
+  if (type === "start") {
+    return currentMonthStart;
+  }
+  if (type === "end") {
+    return currentMonthEnd;
+  }
+  return {
+    start: currentMonthStart,
+    end: currentMonthEnd,
+  };
+}
 
-	function bindChange1(e) {
-		value1.value = e.detail.value
-		changeDays(true, e.detail.value)
-	}
+function nullFunction() {}
 
-	function getDayDate(date = new Date(), type) {
-		const now = date
-		if (type === 'start') {
-			const startOfDay = new Date(now.getFullYear(), now.getMonth(), now.getDate());
-			return startOfDay
-		}
-		if (type === 'end') {
-			const endOfDay = new Date(now.getFullYear(), now.getMonth(), now.getDate(), 23, 59, 59, 999);
-			return endOfDay;
-		}
-	}
+function pickend(e) {
+  console.log(e);
+}
 
-	function getMonthArea(date = new Date(), type) {
-		let now = date
-		let currentMonthStart = new Date(now.getFullYear(), now.getMonth(), 1);
-		let currentMonthEnd = new Date(now.getFullYear(), now.getMonth() + 1, 0, 23, 59, 59, 999);
-		if (type === 'start') {
-			return currentMonthStart
-		}
-		if (type === 'end') {
-			return currentMonthEnd;
-		}
-		return {
-			start: currentMonthStart,
-			end: currentMonthEnd
-		};
-	}
-
-	function nullFunction() {
-
-	}
-
-	function pickend(e) {
-		console.log(e);
-	}
-
-	function pickend1(e) {
-		console.log(e);
-	}
-	defineExpose({
-		close,
-		open,
-		confirm,
-		toggle
-	})
+function pickend1(e) {
+  console.log(e);
+}
+defineExpose({
+  close,
+  open,
+  confirm,
+  toggle,
+});
 </script>
 
 <style lang="scss">
-	.fastTime {
-		.item {
-			background-color: rgb(247, 247, 247);
-			padding: 6rpx 40rpx;
-			border-radius: 6rpx;
-			font-size: 32rpx;
-		}
-	}
+.fastTime {
+  .item {
+    background-color: rgb(247, 247, 247);
+    padding: 6rpx 40rpx;
+    border-radius: 6rpx;
+    font-size: 32rpx;
+  }
+}
 
-	.top {
-		border-bottom: 1px solid #eee;
-	}
+.top {
+  border-bottom: 1px solid #eee;
+}
 
-	.close {
-		position: absolute;
-		top: 50%;
-		transform: translateY(-50%);
-		right: 30rpx;
-	}
+.close {
+  position: absolute;
+  top: 50%;
+  transform: translateY(-50%);
+  right: 30rpx;
+}
 
-	.mask {
-		position: fixed;
-		left: 0;
-		right: 0;
-		bottom: 0;
-		top: 0;
-		background-color: rgba(0, 0, 0, .7);
+.mask {
+  position: fixed;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  top: 0;
+  background-color: rgba(0, 0, 0, 0.7);
 
-		.box {
-			position: absolute;
-			background-color: #fff;
-			bottom: 0;
-			left: 0;
-			right: 0;
-			border-radius: 16rpx 16rpx 0 0;
-		}
-	}
+  .box {
+    position: absolute;
+    background-color: #fff;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    border-radius: 16rpx 16rpx 0 0;
+  }
+}
 
-	.fixed_b {
-		position: absolute;
-		left: 0;
-		right: 0;
-		bottom: 0;
-		padding: 30rpx;
-		z-index: 100;
-		background-color: #fff;
-	}
+.fixed_b {
+  position: absolute;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  padding: 30rpx;
+  z-index: 100;
+  background-color: #fff;
+}
 
-	.picker-view {
-		width: 750rpx;
-		height: 300rpx;
-	}
+.picker-view {
+  width: 750rpx;
+  height: 300rpx;
+}
 
-	.item {
-		line-height: 34px;
-		text-align: center;
-	}
-</style>
\ No newline at end of file
+.item {
+  line-height: 34px;
+  text-align: center;
+}
+</style>
diff --git a/pageSalesSummary/index.vue b/pageSalesSummary/index.vue
index d2b9dee..98c9620 100644
--- a/pageSalesSummary/index.vue
+++ b/pageSalesSummary/index.vue
@@ -1,426 +1,401 @@
 <template>
-	<view class="time-wrapper">
-		<view v-for="(v, i) in timeList" :key="i" class="timelistbox">
-			<view class="time-item" @tap="changeTime(v.value)" :class="{ 'time-selected':v.value==selected }">
-				{{v.label}}
-			</view>
-			<view class="xian" v-if="v.value==selected "> </view>
-		</view>
-	</view>
+  <view class="time-wrapper">
+    <view v-for="(v, i) in timeList" :key="i" class="timelistbox">
+      <view
+        class="time-item"
+        @tap="changeTime(v.value)"
+        :class="[v.value == selected ? 'time-selected' : '']"
+      >
+        {{ v.label }}
+      </view>
+      <view class="xian" v-if="v.value == selected"> </view>
+    </view>
+  </view>
 
-	<view class="pageSalesSummaryContent">
-		<view class="">
-			<view class=""> 实收金额(元) </view>
-			<view class=""> {{list.saleAmount?list.saleAmount:0}} </view>
-		</view>
-		<view class="">
-			<view class=""> 优惠金额(元) </view>
-			<view class=""> {{list.discountAmount?list.discountAmount:0}} </view>
-		</view>
-		<view class="">
-			<view class=""> 客单价(元) </view>
-			<view class=""> {{list.customerUnitPrice?list.customerUnitPrice:0}} </view>
-		</view>
-		<view class="">
-			<view class=""> 会员消费(元) </view>
-			<view class=""> {{list.memberPayAmount?list.memberPayAmount:0}} </view>
-		</view>
-		<view class="">
-			<view class=""> 新增会员(人) </view>
-			<view class=""> {{list.newMemberCount?list.newMemberCount:0}} </view>
-		</view>
-		<view class="">
-			<view class=""> 翻台率(%) </view>
-			<view class=""> {{list.tableTurnoverRate?list.tableTurnoverRate:0}} </view>
-		</view>
-	</view>
-	<view class="table-scroll">
-		<template>
-			<view class="color-333 u-font-28   bg-gray default-box-padding" style="padding-top:80px;">
-				<scroll-view :scroll-x="true" class="bg-fff table u-text-center">
-					<view class="bg-fff border-r-12  u-flex no-wrap u-col-top">
-						<view class="constantbox">
-							<view class="constantboxitem">
-								<view class="head">商品名称</view>
-								<view class="head">总数量</view>
-								<view class="head">金额</view>
-							</view>
-							<view class="constantboxitem" v-for="(item,index) in tableList" :key="index"
-								@click="toDetail(item)">
-								<view class="head" style="padding-left: 16rpx;">
-									<image v-if="index==0" src="../pageTable/index/images/1.png"
-										style="width: 22rpx;height: 30rpx;" mode=""></image>
-									<image v-else-if="index==1" src="../pageTable/index/images/2.png"
-										style="width: 22rpx;height: 30rpx;" mode=""></image>
-									<image v-else-if="index==2" src="../pageTable/index/images/3.png"
-										style="width: 22rpx;height: 30rpx;" mode=""></image>
-									&nbsp;&nbsp;{{item.productName}}
-								</view>
-								<view class="head">{{item.number}}</view>
-								<view class="head">{{item.amount || '无'}}</view>
-							</view>
-						</view>
-					</view>
-				</scroll-view>
-			</view>
-		</template>
-	</view>
-	<view class="bottombtn" @tap="toUrl">
-		更多 <uni-icons type="right" size="16"></uni-icons>
-	</view>
-	<datePickerview @confirm="datePickerConfirm" ref="datePicker"></datePickerview>
+  <view class="pageSalesSummaryContent">
+    <view class="">
+      <view class=""> 实收金额(元) </view>
+      <view class=""> {{ list.saleAmount ? list.saleAmount : 0 }} </view>
+    </view>
+    <view class="">
+      <view class=""> 优惠金额(元) </view>
+      <view class="">
+        {{ list.discountAmount ? list.discountAmount : 0 }}
+      </view>
+    </view>
+    <view class="">
+      <view class=""> 客单价(元) </view>
+      <view class="">
+        {{ list.customerUnitPrice ? list.customerUnitPrice : 0 }}
+      </view>
+    </view>
+    <view class="">
+      <view class=""> 会员消费(元) </view>
+      <view class="">
+        {{ list.memberPayAmount ? list.memberPayAmount : 0 }}
+      </view>
+    </view>
+    <view class="">
+      <view class=""> 新增会员(人) </view>
+      <view class="">
+        {{ list.newMemberCount ? list.newMemberCount : 0 }}
+      </view>
+    </view>
+    <view class="">
+      <view class=""> 翻台率(%) </view>
+      <view class="">
+        {{ list.tableTurnoverRate ? list.tableTurnoverRate : 0 }}
+      </view>
+    </view>
+  </view>
+  <view class="table-scroll">
+    <view class="color-333 u-font-28 bg-gray default-box-padding">
+      <scroll-view :scroll-x="true" class="bg-fff table u-text-center">
+        <view class="bg-fff border-r-12 u-flex no-wrap u-col-top">
+          <view class="constantbox">
+            <view class="constantboxitem">
+              <view class="head">商品名称</view>
+              <view class="head">总数量</view>
+              <view class="head">金额</view>
+            </view>
+            <view
+              class="constantboxitem"
+              v-for="(item, index) in tableList"
+              :key="index"
+              @click="toDetail(item)"
+            >
+              <view class="head" style="padding-left: 16rpx">
+                <image
+                  v-if="index == 0"
+                  src="../pageTable/index/images/1.png"
+                  style="width: 22rpx; height: 30rpx"
+                  mode=""
+                ></image>
+                <image
+                  v-else-if="index == 1"
+                  src="../pageTable/index/images/2.png"
+                  style="width: 22rpx; height: 30rpx"
+                  mode=""
+                ></image>
+                <image
+                  v-else-if="index == 2"
+                  src="../pageTable/index/images/3.png"
+                  style="width: 22rpx; height: 30rpx"
+                  mode=""
+                ></image>
+                &nbsp;&nbsp;{{ item.productName }}
+              </view>
+              <view class="head">{{ item.saleCount || 0 }}</view>
+              <view class="head">{{ item.saleAmount || 0 }}</view>
+            </view>
+          </view>
+        </view>
+      </scroll-view>
+    </view>
+  </view>
+  <view class="bottombtn" @tap="toUrl">
+    更多 <uni-icons type="right" size="16"></uni-icons>
+  </view>
+  <datePickerview
+    @confirm="datePickerConfirm"
+    ref="datePicker"
+  ></datePickerview>
 </template>
 
 <script setup>
-	import { onMounted, ref } from 'vue';
-	import datePickerview from './components/my-date-pickerview.vue'
-	import dayjs from 'dayjs' //时间格式库
-	import go from '@/commons/utils/go.js'
-	import { getTrade, productSaleDate } from '@/http/api/summary.js'
-	
-	const datePicker=ref()
-	const timeList = [{
-			label: '今天',
-			value: 'today'
-		},
-		{
-			label: '昨天',
-			value: 'yesterday'
-		},
-		{
-			label: '本周',
-			value: 'circumference'
-		}, {
-			label: '本月',
-			value: 'moon'
-		},
-		{
-			label: '自定义',
-			value: 'custom'
-		}
-	]
-	let selected = ref('today')
-	let list = ref({})
-	let tableList = ref([])
-	let day = ref(1)
-	onMounted(() => {
-		getlist()
-		gettableData()
-	})
-	
-	/**
-	 * 获取营业数据
-	 * @param {Object} start
-	 * @param {Object} end
-	 */
-	function getlist(start, end) {
-		let startTime, endTime;
-		if (selected.value == 'today') {
-			startTime = dayjs().format('YYYY-MM-DD') + ' 00:00:00'
-			endTime = dayjs().format('YYYY-MM-DD') + ' 23:59:59'
-		} else if (selected.value == 'yesterday') {
-			startTime = formatTime() + ' 00:00:00'
-			endTime = formatTime() + ' 23:59:59'
-		} else if (selected.value == 'circumference') {
-			var now = new Date();
-			var nowTime = now.getTime();
-			var day = now.getDay();
-			var oneDayTime = 24 * 60 * 60 * 1000;
-			//显示周一
-			var MondayTime = nowTime - (day - 1) * oneDayTime;
-			//显示周日
-			var SundayTime = nowTime + (7 - day) * oneDayTime;
-			startTime = dayjs(MondayTime).format('YYYY-MM-DD 00:00:00')
-			endTime = dayjs(SundayTime).format('YYYY-MM-DD 23:59:59')
-		} else if (selected.value == 'moon') {
-			startTime = dayjs().startOf('month').format('YYYY-MM-DD') + ' 00:00:00'
-			endTime = dayjs().endOf('month').format('YYYY-MM-DD') + ' 23:59:59'
-		} else if (selected.value == 'custom') {
-			let s = start.substring(0, start.indexOf(' '))
-			let e = end.substring(0, end.indexOf(' '))
-			startTime = s + ' 00:00:00'
-			endTime = e + ' 23:59:59'
-		}
-		getTrade({
-			beginDate: startTime,
-			endDate: endTime,
-		}).then((res) => {
-			list.value = res
-		})
-	}
-	
-	/**
-	 * 获取销售数据
-	 */
-	function gettableData() {
-		if (selected.value == 'today') {
-			day.value = 1
-		} else if (selected.value == 'yesterday') {
-			day.value = 1
-		} else if (selected.value == 'circumference') {
-			day.value = 7
-		} else if (selected.value == 'moon') {
-			day.value = 30
-		} else if (selected.value == 'custom') {
-			day.value = 30
-		}
-		productSaleDate({
-			day: day.value,
-			page: 1,
-			size: 5
-		}).then((res) => {
-			tableList.value = res.records
-		})
-	
-	}
-	
-	/**
-	 * 获取当前时间
-	 */
-	function getdate() {
-		const dt = new Date();
-		const y = dt.getFullYear();
-		const m = (dt.getMonth() + 1 + "").padStart(2, "0");
-		const d = (dt.getDate() + "").padStart(2, "0");
-		const hh = (dt.getHours() + "").padStart(2, "0");
-		const mm = (dt.getMinutes() + "").padStart(2, "0");
-		const ss = (dt.getSeconds() + "").padStart(2, "0");
-		return `${y}-${m}-${d}`;
-	}
-	
-	/**
-	 * 获取昨天时间
-	 */
-	const formatTime = () => {
-		let strDate = getdate()
-		let dateFormat = new Date(strDate);
-		dateFormat = dateFormat.setDate(dateFormat.getDate() - 1);
-		dateFormat = new Date(dateFormat);
-		let y = dateFormat.getFullYear()
-		let m = (dateFormat.getMonth() + 1).toString().padStart(2, '0')
-		let d = dateFormat.getDate().toString().padStart(2, '0')
-		return `${y}-${m}-${d}`
-	}
-	
-	/**
-	 * 时间切换
-	 * @param {Object} e
-	 */
-	function changeTime(e) {
-		selected.value = e
-		if (e == 'custom') {
-			datePicker.value.toggle()
-		} else {
-			getlist()
-			gettableData()
-		}
-	}
-	
-	/**
-	 * 自定义确认
-	 * @param {Object} e
-	 */
-	function datePickerConfirm(e) {
-		console.log(e)
-		getlist(e.start, e.end)
-		gettableData()
-	}
-	
-	/**
-	 * 更多
-	 */
-	function toUrl() {
-		go.to('PAGES_PRODUCT_SALES_RANKING', {
-			day: day.value
-		})
-	}
+import { onMounted, ref } from "vue";
+import datePickerview from "./components/my-date-pickerview.vue";
+import dayjs from "dayjs"; //时间格式库
+import go from "@/commons/utils/go.js";
+import { getTrade } from "@/http/api/summary.js";
+import { saleSummaryPage } from "@/http/api/order/summary.js";
+import { timeList } from "@/data/index.js";
 
+const datePicker = ref();
 
+let selected = ref("today");
+let list = ref({});
+let tableList = ref([]);
+let day = ref(1);
+onMounted(() => {
+  getData();
+});
+
+/**
+ * 获取营业数据
+ * @param {Object} beginDate
+ * @param {Object} endDate
+ */
+function getlist(beginDate, endDate) {
+  getTrade({
+    beginDate,
+    endDate,
+    rangeType: selected.value,
+  }).then((res) => {
+    list.value = res;
+  });
+}
+
+/**
+ * 获取销售数据
+ * @param {Object} beginDate
+ * @param {Object} endDate
+ */
+function gettableData(beginDate, endDate) {
+  saleSummaryPage({
+    beginDate,
+    endDate,
+    rangeType: selected.value,
+  }).then((res) => {
+    tableList.value = (res || []).slice(0, 5);
+  });
+}
+
+/**
+ * 时间切换
+ * @param {Object} e
+ */
+function changeTime(e) {
+  selected.value = e;
+  if (e == "custom") {
+    datePicker.value.toggle();
+  } else {
+    getData();
+  }
+}
+
+const datePickerData = ref({
+  beginDate: "",
+  endDate: "",
+});
+/**
+ * 自定义确认
+ * @param {Object} e
+ */
+function datePickerConfirm(e) {
+  datePickerData.value.beginDate = e.start;
+  datePickerData.value.endDate = e.end;
+  getData(e.start, e.end);
+}
+function getData(start, end) {
+  let beginDate, endDate;
+  if (selected.value == "custom") {
+    beginDate = start.substring(0, start.indexOf(" "));
+    endDate = end.substring(0, end.indexOf(" "));
+  } else {
+    beginDate = timeList.find((item) => item.value == selected.value).beginDate;
+    endDate = timeList.find((item) => item.value == selected.value).endDate;
+  }
+  getlist(beginDate, endDate);
+  gettableData(beginDate, endDate);
+}
+/**
+ * 更多
+ */
+function toUrl() {
+  let beginDate, endDate;
+  if (selected.value == "custom") {
+    beginDate = datePickerData.value.beginDate.substring(
+      0,
+      datePickerData.value.beginDate.indexOf(" ")
+    );
+    endDate = datePickerData.value.endDate.substring(
+      0,
+      datePickerData.value.endDate.indexOf(" ")
+    );
+  } else {
+    beginDate = timeList.find((item) => item.value == selected.value).beginDate;
+    endDate = timeList.find((item) => item.value == selected.value).endDate;
+  }
+  go.to("PAGES_PRODUCT_SALES_RANKING", {
+    beginDate,
+    endDate,
+    rangeType: selected.value,
+  });
+}
 </script>
 <style>
-	page {
-		background: #f6f6f6;
-	}
+page {
+  background: #f6f6f6;
+}
 </style>
 <style lang="scss" scoped>
+.fixed-top {
+  padding: 32rpx 28rpx;
+  z-index: 100;
+}
 
-	.fixed-top {
-		padding: 32rpx 28rpx;
-		z-index: 100;
-	}
+.bottom {
+  background-color: transparent;
+  bottom: 84rpx;
+  left: 28rpx;
+  right: 28rpx;
+}
 
-	.bottom {
-		background-color: transparent;
-		bottom: 84rpx;
-		left: 28rpx;
-		right: 28rpx;
-	}
+.table {
+  border-radius: 12rpx 12rpx 0rpx 0rpx;
+  overflow: hidden;
+  font-size: 24rpx;
 
-	.table {
-		border-radius: 12rpx 12rpx 0rpx 0rpx;
-		overflow: hidden;
-		font-size: 24rpx;
+  .constantbox {
+    .constantboxitem {
+      display: flex;
 
-		.constantbox {
-			.constantboxitem {
-				display: flex;
+      .head {
+        width: 220rpx;
+        padding: 32rpx 24rpx;
+        font-family: Source Han Sans CN, Source Han Sans CN;
+        font-weight: 400;
+        font-size: 24rpx;
+        color: #333333;
+        overflow: hidden; //超出的文本隐藏
+        text-overflow: ellipsis; //溢出用省略号显示
+        white-space: nowrap; //溢出不换行
+      }
 
-				.head {
-					width: 220rpx;
-					padding: 32rpx 24rpx;
-					font-family: Source Han Sans CN, Source Han Sans CN;
-					font-weight: 400;
-					font-size: 24rpx;
-					color: #333333;
-					overflow: hidden; //超出的文本隐藏
-					text-overflow: ellipsis; //溢出用省略号显示
-					white-space: nowrap; //溢出不换行
-				}
+      .head:nth-child(4) {
+        width: 300rpx;
+      }
 
-				.head:nth-child(4) {
-					width: 300rpx;
-				}
+      .head:nth-child(5) {
+        width: 300rpx;
+      }
+    }
 
-				.head:nth-child(5) {
-					width: 300rpx;
-				}
-			}
+    .constantboxitem:nth-child(even) {
+      background: #fff;
+    }
 
-			.constantboxitem:nth-child(even) {
-				background: #fff;
-			}
+    .constantboxitem:nth-child(odd) {
+      background: #f7f6fb;
+    }
 
-			.constantboxitem:nth-child(odd) {
-				background: #F7F6FB;
-			}
+    .constantboxitem:nth-child(1) {
+      background: #aebad2;
+      color: #fff;
+      font-size: 24rpx;
+    }
+  }
 
-			.constantboxitem:nth-child(1) {
-				background: #AEBAD2;
-				color: #fff;
-				font-size: 24rpx;
-			}
-		}
-
-		.item:nth-of-type(2n+1) {
-			background-color: rgb(249, 249, 249);
-		}
-	}
+  .item:nth-of-type(2n + 1) {
+    background-color: rgb(249, 249, 249);
+  }
+}
 </style>
 
 <style scoped lang="less">
-	.time-wrapper {
-		display: flex;
-		justify-content: space-around;
-		padding-bottom: 16rpx;
-		padding-top: 16rpx;
-		background-color: #fff;
+.time-wrapper {
+  display: flex;
+  justify-content: space-around;
+  padding-bottom: 16rpx;
+  padding-top: 16rpx;
+  background-color: #fff;
 
-		.timelistbox {
-			position: relative;
-			display: flex;
-			flex-direction: column;
-			align-items: center;
+  .timelistbox {
+    position: relative;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
 
-			.time-item {
-				font-size: 28rpx;
-				text-align: center;
-				padding-bottom: 10rpx;
-			}
+    .time-item {
+      font-size: 28rpx;
+      text-align: center;
+      padding-bottom: 10rpx;
+    }
 
-			.xian {
-				width: 40rpx;
-				height: 3rpx;
-				background-color: #318AFE;
-				// position: absolute;
-				// left: 16rpx;
-				// bottom: 0;
-			}
-		}
+    .xian {
+      width: 40rpx;
+      height: 3rpx;
+      background-color: #318afe;
+      // position: absolute;
+      // left: 16rpx;
+      // bottom: 0;
+    }
+  }
 
-		.time-selected {
-			color: #318afe;
-			font-size: 32rpx !important;
-		}
-	}
+  .time-selected {
+    color: #318afe;
+    font-size: 32rpx !important;
+  }
+}
 
-	.pageSalesSummaryContent {
-		height: 320rpx;
-		margin: 20rpx 28rpx;
-		background-image: url('./svg/bgimg.svg');
-		background-size: 694rpx 320rpx;
-		padding: 48rpx 28rpx;
-		.df;
-		justify-content: space-between;
-		flex-wrap: wrap;
+.pageSalesSummaryContent {
+  height: 320rpx;
+  margin: 20rpx 28rpx;
+  background-image: url("./svg/bgimg.svg");
+  background-size: 694rpx 320rpx;
+  padding: 48rpx 28rpx;
+  .df;
+  justify-content: space-between;
+  flex-wrap: wrap;
 
-		>view {
-			padding-right: 52rpx;
-			color: #fff;
-			font-family: Source Han Sans CN, Source Han Sans CN;
-			font-weight: 400;
-			font-size: 28rpx;
-		}
-	}
+  > view {
+    padding-right: 52rpx;
+    color: #fff;
+    font-family: Source Han Sans CN, Source Han Sans CN;
+    font-weight: 400;
+    font-size: 28rpx;
+  }
+}
 
-	// 表格
-	.table-scroll {
-		// width: calc(100% - 5px);
-		overflow-x: scroll;
-		white-space: nowrap;
-		margin: 32rpx 28rpx;
-		margin-right: 30rpx;
-		border-radius: 30rpx 30rpx 0 0;
+// 表格
+.table-scroll {
+  // width: calc(100% - 5px);
+  overflow-x: scroll;
+  white-space: nowrap;
+  margin: 32rpx 28rpx;
+  margin-right: 30rpx;
+  border-radius: 30rpx 30rpx 0 0;
+}
 
-	}
+.table-scroll .table {
+  table-layout: fixed;
+  // width: calc(100% - 10rpx);
+}
 
-	.table-scroll .table {
-		table-layout: fixed;
-		// width: calc(100% - 10rpx);
-	}
+.table-scroll .thead {
+  display: table-row;
+  background-color: bisque;
+  font-size: 24rpx;
+}
 
-	.table-scroll .thead {
-		display: table-row;
-		background-color: bisque;
-		font-size: 24rpx;
-	}
+.table-scroll .tbody {
+  overflow-y: scroll;
+  overflow-x: hidden;
+  display: block;
+  // width: 1040rpx;
+  width: 100%;
+  // width: calc(100% );
+}
 
-	.table-scroll .tbody {
-		overflow-y: scroll;
-		overflow-x: hidden;
-		display: block;
-		// width: 1040rpx;
-		width: 100%;
-		// width: calc(100% );
-	}
+// .table-scroll th,
+// td {
+// 	height: 82rpx;
+// 	overflow: hidden;
+// 	text-overflow: ellipsis;
+// 	width: 250rpx;
+// 	// border: 0.7rpx solid red;
+// 	border: 0.7rpx solid rgba(126, 155, 212, 0.27);
+// }
 
-	// .table-scroll th,
-	// td {
-	// 	height: 82rpx;
-	// 	overflow: hidden;
-	// 	text-overflow: ellipsis;
-	// 	width: 250rpx;
-	// 	// border: 0.7rpx solid red;
-	// 	border: 0.7rpx solid rgba(126, 155, 212, 0.27);
-	// }
+.bottombtn {
+  width: 694rpx;
+  height: 56rpx;
+  line-height: 56rpx;
+  text-align: center;
+  margin: 0rpx auto;
+  background: #f1f1f1;
+  font-size: 24rpx;
+  border-radius: 0rpx 0rpx 28rpx 28rpx;
+}
 
-	.bottombtn {
-		width: 694rpx;
-		height: 56rpx;
-		line-height: 56rpx;
-		text-align: center;
-		margin: 0rpx auto;
-		background: #F1F1F1;
-		font-size: 24rpx;
-		border-radius: 0rpx 0rpx 28rpx 28rpx;
-	}
-
-	.df() {
-		display: flex;
-		align-items: center;
-	}
+.df() {
+  display: flex;
+  align-items: center;
+}
 </style>
 <style>
-	.min-page{
-		height: 20vh;
-	}
-</style>
\ No newline at end of file
+.min-page {
+  height: 20vh;
+}
+</style>
diff --git a/pageSalesSummary/productSalesRanking.vue b/pageSalesSummary/productSalesRanking.vue
index 46e07bc..867af9f 100644
--- a/pageSalesSummary/productSalesRanking.vue
+++ b/pageSalesSummary/productSalesRanking.vue
@@ -1,153 +1,156 @@
 <template>
-	<template>
-		<view class="color-333 u-font-28   bg-gray default-box-padding"  >
-			<scroll-view :scroll-x="true" class="bg-fff table u-text-center">
-				<view class="bg-fff border-r-12  u-flex no-wrap u-col-top">
-					<view class="constantbox">
-						<view class="constantboxitem">
-							<view class="head">商品名称</view>
-							<view class="head">总数量</view>
-							<view class="head">金额</view>
-						</view>
-						<view class="constantboxitem" v-for="(item,index) in tableList" :key="index"
-							@click="toDetail(item)">
-							<view class="head">{{item.productName}}</view>
-							<view class="head">{{item.number}}</view>
-							<view class="head">{{item.amount || '无'}}</view>
-						</view>
-					</view>
-				</view>
-			</scroll-view>
-		</view>
-	</template>
+  <view class="color-333 u-font-28 bg-gray default-box-padding">
+    <scroll-view :scroll-x="true" class="bg-fff table u-text-center">
+      <view class="bg-fff border-r-12 u-flex no-wrap u-col-top">
+        <view class="constantbox">
+          <view class="constantboxitem">
+            <view class="head">商品名称</view>
+            <view class="head">总数量</view>
+            <view class="head">金额</view>
+          </view>
+          <view
+            class="constantboxitem"
+            v-for="(item, index) in tableList"
+            :key="index"
+            @click="toDetail(item)"
+          >
+            <view class="head">{{ item.productName }}</view>
+			<view class="head">{{ item.saleCount || 0 }}</view>
+			<view class="head">{{ item.saleAmount || 0 }}</view>
+          </view>
+        </view>
+      </view>
+    </scroll-view>
+  </view>
 </template>
 
 <script setup>
-	import { onMounted, ref } from 'vue';
-	import { productSaleDate } from '@/http/api/summary.js'
-	
-	let tableList = ref([])
-	let props = defineProps({
-		day: {
-			type: Number
-		}
-	})
-	
-	onMounted(() => {
-		gettableData()
-	})
-	
-	/**
-	 * 获取销售数据
-	 */
-	function gettableData() {
-		productSaleDate({
-			day: props.day,
-			page: 1,
-			size: 50
-		}).then((res) => {
-			tableList.value = res.records
-		})
-	}
+import { onLoad } from "@dcloudio/uni-app";
+import { onMounted, reactive, ref } from "vue";
+import { saleSummaryPage } from "@/http/api/order/summary.js";
+
+let tableList = ref([]);
+let props = defineProps({
+  day: {
+    type: Number,
+  },
+});
+const options = reactive({
+  beginDate: "",
+  endDate: "",
+  rangeType: "",
+});
+onLoad((opt) => {
+	console.log(opt);
+  Object.assign(options, opt);
+  gettableData();
+});
+
+/**
+ * 获取销售数据
+ */
+function gettableData() {
+  saleSummaryPage(options).then((res) => {
+    tableList.value = res || [];
+  });
+}
 </script>
 
 <style>
-	.table-scroll {
-		overflow-x: scroll;
-		white-space: nowrap;
-		margin: 32rpx 28rpx;
-		margin-right: 30rpx;
-		border-radius: 30rpx 30rpx 0 0;
-	
-	}
-	
-	.table-scroll table {
-		table-layout: fixed;
-	}
-	
-	.table-scroll thead {
-		display: table-row;
-		background-color: bisque;
-		font-size: 24rpx;
-	}
-	
-	.table-scroll tbody {
-		overflow-y: scroll;
-		overflow-x: hidden;
-		display: block;
-		width: 100%;
-	}
-	
-	.table-scroll th,
-	td {
-		height: 82rpx;
-		overflow: hidden;
-		text-overflow: ellipsis;
-		width: 250rpx;
-		border: 0.7rpx solid rgba(126, 155, 212, 0.27);
-	}
+.table-scroll {
+  overflow-x: scroll;
+  white-space: nowrap;
+  margin: 32rpx 28rpx;
+  margin-right: 30rpx;
+  border-radius: 30rpx 30rpx 0 0;
+}
+
+.table-scroll table {
+  table-layout: fixed;
+}
+
+.table-scroll thead {
+  display: table-row;
+  background-color: bisque;
+  font-size: 24rpx;
+}
+
+.table-scroll tbody {
+  overflow-y: scroll;
+  overflow-x: hidden;
+  display: block;
+  width: 100%;
+}
+
+.table-scroll th,
+td {
+  height: 82rpx;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  width: 250rpx;
+  border: 0.7rpx solid rgba(126, 155, 212, 0.27);
+}
 </style>
 <style lang="scss" scoped>
+.fixed-top {
+  padding: 32rpx 28rpx;
+  z-index: 100;
+}
 
-	.fixed-top {
-		padding: 32rpx 28rpx;
-		z-index: 100;
-	}
+.bottom {
+  background-color: transparent;
+  bottom: 84rpx;
+  left: 28rpx;
+  right: 28rpx;
+}
 
-	.bottom {
-		background-color: transparent;
-		bottom: 84rpx;
-		left: 28rpx;
-		right: 28rpx;
-	}
+.table {
+  border-radius: 12rpx 12rpx 0rpx 0rpx;
+  overflow: hidden;
+  font-size: 24rpx;
 
-	.table {
-		border-radius: 12rpx 12rpx 0rpx 0rpx;
-		overflow: hidden;
-		font-size: 24rpx;
+  .constantbox {
+    .constantboxitem {
+      display: flex;
 
-		.constantbox {
-			.constantboxitem {
-				display: flex;
+      .head {
+        width: 220rpx;
+        padding: 32rpx 24rpx;
+        font-family: Source Han Sans CN, Source Han Sans CN;
+        font-weight: 400;
+        font-size: 24rpx;
+        color: #333333;
+        overflow: hidden; //超出的文本隐藏
+        text-overflow: ellipsis; //溢出用省略号显示
+        white-space: nowrap; //溢出不换行
+      }
 
-				.head {
-					width: 220rpx;
-					padding: 32rpx 24rpx;
-					font-family: Source Han Sans CN, Source Han Sans CN;
-					font-weight: 400;
-					font-size: 24rpx;
-					color: #333333;
-					overflow: hidden; //超出的文本隐藏
-					text-overflow: ellipsis; //溢出用省略号显示
-					white-space: nowrap; //溢出不换行
-				}
+      .head:nth-child(4) {
+        width: 300rpx;
+      }
 
-				.head:nth-child(4) {
-					width: 300rpx;
-				}
+      .head:nth-child(5) {
+        width: 300rpx;
+      }
+    }
 
-				.head:nth-child(5) {
-					width: 300rpx;
-				}
-			}
+    .constantboxitem:nth-child(even) {
+      background: #fff;
+    }
 
-			.constantboxitem:nth-child(even) {
-				background: #fff;
-			}
+    .constantboxitem:nth-child(odd) {
+      background: #f7f6fb;
+    }
 
-			.constantboxitem:nth-child(odd) {
-				background: #F7F6FB;
-			}
+    .constantboxitem:nth-child(1) {
+      background: #aebad2;
+      color: #fff;
+      font-size: 24rpx;
+    }
+  }
 
-			.constantboxitem:nth-child(1) {
-				background: #AEBAD2;
-				color: #fff;
-				font-size: 24rpx;
-			}
-		}
-
-		.item:nth-of-type(2n+1) {
-			background-color: rgb(249, 249, 249);
-		}
-	}
+  .item:nth-of-type(2n + 1) {
+    background-color: rgb(249, 249, 249);
+  }
+}
 </style>
diff --git a/pageSalesSummary/table.vue b/pageSalesSummary/table.vue
new file mode 100644
index 0000000..a1b5b44
--- /dev/null
+++ b/pageSalesSummary/table.vue
@@ -0,0 +1,346 @@
+<template>
+  <view class="time-wrapper">
+    <view v-for="(v, i) in timeList" :key="i" class="timelistbox">
+      <view
+        class="time-item"
+        @tap="changeTime(v.value)"
+        :class="[v.value == selected ? 'time-selected' : '']"
+      >
+        {{ v.label }}
+      </view>
+      <view class="xian" v-if="v.value == selected"> </view>
+    </view>
+  </view>
+
+  <view class="table-scroll">
+    <view class="color-333 u-font-28 bg-gray">
+      <scroll-view :scroll-x="true" class="bg-fff table u-text-center">
+        <view class="bg-fff border-r-12 u-flex no-wrap u-col-top">
+          <view class="constantbox">
+            <view class="constantboxitem">
+              <view class="head">区域名称</view>
+              <view class="head">台桌号</view>
+              <view class="head">订单数量</view>
+              <view class="head">订单金额</view>
+            </view>
+            <view
+              class="constantboxitem"
+              v-for="(item, index) in tableList"
+              :key="index"
+              @click="toDetail(item)"
+            >
+              <view class="head" style="padding-left: 16rpx">
+                <image
+                  v-if="index == 0"
+                  src="../pageTable/index/images/1.png"
+                  style="width: 22rpx; height: 30rpx"
+                  mode=""
+                ></image>
+                <image
+                  v-else-if="index == 1"
+                  src="../pageTable/index/images/2.png"
+                  style="width: 22rpx; height: 30rpx"
+                  mode=""
+                ></image>
+                <image
+                  v-else-if="index == 2"
+                  src="../pageTable/index/images/3.png"
+                  style="width: 22rpx; height: 30rpx"
+                  mode=""
+                ></image>
+                &nbsp;&nbsp;{{ item.areaName }}
+              </view>
+              <view class="head">{{ item.tableName || "" }}</view>
+              <view class="head">{{ item.orderCount || 0 }}</view>
+              <view class="head">{{ item.orderAmount || 0 }}</view>
+            </view>
+          </view>
+        </view>
+      </scroll-view>
+    </view>
+  </view>
+
+  <view style="height: 80rpx;"></view>
+  <!-- <view class="bottombtn" @tap="toUrl">
+    更多 <uni-icons type="right" size="16"></uni-icons>
+  </view> -->
+  <datePickerview
+    @confirm="datePickerConfirm"
+    ref="datePicker"
+  ></datePickerview>
+</template>
+
+<script setup>
+import { onMounted, ref } from "vue";
+import datePickerview from "./components/my-date-pickerview.vue";
+import dayjs from "dayjs"; //时间格式库
+import go from "@/commons/utils/go.js";
+import { getTrade, productSaleDate } from "@/http/api/summary.js";
+import { timeList } from "@/data/index.js";
+import { tableSummaryList } from "@/http/api/order/summary.js";
+
+const datePicker = ref();
+
+let selected = ref("today");
+let list = ref({});
+let tableList = ref([]);
+let day = ref(1);
+onMounted(() => {
+  gettableData();
+});
+
+
+
+/**
+ * 获取销售数据
+ */
+function gettableData(start, end) {
+    let beginDate, endDate;
+  if (selected.value == "custom") {
+    beginDate = start.substring(0, start.indexOf(" "));
+    endDate = end.substring(0, end.indexOf(" "));
+  } else {
+    beginDate = timeList.find((item) => item.value == selected.value).beginDate;
+    endDate = timeList.find((item) => item.value == selected.value).endDate;
+  }
+  tableSummaryList({
+    beginDate: beginDate,
+    endDate: endDate,
+    rangeType: selected.value,
+  }).then((res) => {
+    tableList.value = res || [];
+  });
+}
+
+/**
+ * 获取当前时间
+ */
+function getdate() {
+  const dt = new Date();
+  const y = dt.getFullYear();
+  const m = (dt.getMonth() + 1 + "").padStart(2, "0");
+  const d = (dt.getDate() + "").padStart(2, "0");
+  const hh = (dt.getHours() + "").padStart(2, "0");
+  const mm = (dt.getMinutes() + "").padStart(2, "0");
+  const ss = (dt.getSeconds() + "").padStart(2, "0");
+  return `${y}-${m}-${d}`;
+}
+
+
+
+/**
+ * 时间切换
+ * @param {Object} e
+ */
+function changeTime(e) {
+  selected.value = e;
+  if (e == "custom") {
+    datePicker.value.toggle();
+  } else {
+    gettableData();
+  }
+}
+
+/**
+ * 自定义确认
+ * @param {Object} e
+ */
+function datePickerConfirm(e) {
+  console.log(e);
+  gettableData(e.start, e.end);
+}
+
+/**
+ * 更多
+ */
+function toUrl() {
+  go.to("PAGES_PRODUCT_SALES_RANKING", {
+    day: day.value,
+  });
+}
+</script>
+<style>
+page {
+  background: #f6f6f6;
+}
+</style>
+<style lang="scss" scoped>
+.fixed-top {
+  padding: 32rpx 28rpx;
+  z-index: 100;
+}
+
+.bottom {
+  background-color: transparent;
+  bottom: 84rpx;
+  left: 28rpx;
+  right: 28rpx;
+}
+
+.table {
+  border-radius: 12rpx 12rpx 0rpx 0rpx;
+  overflow: hidden;
+  font-size: 24rpx;
+
+  .constantbox {
+    .constantboxitem {
+      display: flex;
+
+      .head {
+        width: 220rpx;
+        padding: 32rpx 24rpx;
+        font-family: Source Han Sans CN, Source Han Sans CN;
+        font-weight: 400;
+        font-size: 24rpx;
+        color: #333333;
+        overflow: hidden; //超出的文本隐藏
+        text-overflow: ellipsis; //溢出用省略号显示
+        white-space: nowrap; //溢出不换行
+      }
+
+      .head:nth-child(4) {
+        width: 300rpx;
+      }
+
+      .head:nth-child(5) {
+        width: 300rpx;
+      }
+    }
+
+    .constantboxitem:nth-child(even) {
+      background: #fff;
+    }
+
+    .constantboxitem:nth-child(odd) {
+      background: #f7f6fb;
+    }
+
+    .constantboxitem:nth-child(1) {
+      background: #aebad2;
+      color: #fff;
+      font-size: 24rpx;
+    }
+  }
+
+  .item:nth-of-type(2n + 1) {
+    background-color: rgb(249, 249, 249);
+  }
+}
+</style>
+
+<style scoped lang="less">
+.time-wrapper {
+  display: flex;
+  justify-content: space-around;
+  padding-bottom: 16rpx;
+  padding-top: 16rpx;
+  background-color: #fff;
+
+  .timelistbox {
+    position: relative;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+
+    .time-item {
+      font-size: 28rpx;
+      text-align: center;
+      padding-bottom: 10rpx;
+    }
+
+    .xian {
+      width: 40rpx;
+      height: 3rpx;
+      background-color: #318afe;
+      // position: absolute;
+      // left: 16rpx;
+      // bottom: 0;
+    }
+  }
+
+  .time-selected {
+    color: #318afe;
+    font-size: 32rpx !important;
+  }
+}
+
+.pageSalesSummaryContent {
+  height: 320rpx;
+  margin: 20rpx 28rpx;
+  background-image: url("./svg/bgimg.svg");
+  background-size: 694rpx 320rpx;
+  padding: 48rpx 28rpx;
+  .df;
+  justify-content: space-between;
+  flex-wrap: wrap;
+
+  > view {
+    padding-right: 52rpx;
+    color: #fff;
+    font-family: Source Han Sans CN, Source Han Sans CN;
+    font-weight: 400;
+    font-size: 28rpx;
+  }
+}
+
+// 表格
+.table-scroll {
+  // width: calc(100% - 5px);
+  overflow-x: scroll;
+  white-space: nowrap;
+  margin: 32rpx 28rpx;
+  margin-right: 30rpx;
+  border-radius: 30rpx 30rpx 0 0;
+}
+
+.table-scroll .table {
+  table-layout: fixed;
+  // width: calc(100% - 10rpx);
+}
+
+.table-scroll .thead {
+  display: table-row;
+  background-color: bisque;
+  font-size: 24rpx;
+}
+
+.table-scroll .tbody {
+  overflow-y: scroll;
+  overflow-x: hidden;
+  display: block;
+  // width: 1040rpx;
+  width: 100%;
+  // width: calc(100% );
+}
+
+// .table-scroll th,
+// td {
+// 	height: 82rpx;
+// 	overflow: hidden;
+// 	text-overflow: ellipsis;
+// 	width: 250rpx;
+// 	// border: 0.7rpx solid red;
+// 	border: 0.7rpx solid rgba(126, 155, 212, 0.27);
+// }
+
+.bottombtn {
+  width: 694rpx;
+  height: 56rpx;
+  line-height: 56rpx;
+  text-align: center;
+  margin: 0rpx auto;
+  background: #f1f1f1;
+  font-size: 24rpx;
+  border-radius: 0rpx 0rpx 28rpx 28rpx;
+}
+
+.df() {
+  display: flex;
+  align-items: center;
+}
+</style>
+<style>
+.min-page {
+  height: 20vh;
+}
+</style>
diff --git a/pages.json b/pages.json
index 6f9db8b..e0e95d8 100644
--- a/pages.json
+++ b/pages.json
@@ -401,7 +401,16 @@
 				"style": {
 					"navigationBarTitleText": "商品销售排行"
 				}
-			}]
+			},
+			{
+				"pageId": "PAGES_TABLE_SALES_RANKING",
+				"path": "table",
+				"style": {
+					"navigationBarTitleText": "桌台统计"
+				}
+			}
+			
+		]
 		},
 		{
 			"root": "pageLineUp",
diff --git a/pages/appliccation/marketing.vue b/pages/appliccation/marketing.vue
index e15262a..ea60459 100644
--- a/pages/appliccation/marketing.vue
+++ b/pages/appliccation/marketing.vue
@@ -58,7 +58,7 @@ const menuList = ref([
 			{
 				title: '新客立减',
 				icon: '',
-				pageUrl: 'PAGES_ORDER_INDEX',
+				pageUrl: 'PAGES_MARKET_NEW_USER_DISCOUNT',
 				intro: '首单下单减免金额'
 			},
 			{
diff --git a/pages/index/components/Stats.vue b/pages/index/components/Stats.vue
index 0537364..a7983af 100644
--- a/pages/index/components/Stats.vue
+++ b/pages/index/components/Stats.vue
@@ -1,302 +1,294 @@
 <template>
-	<view class="index-header" @tap="go.to('PAGES_STAT')">
-		<view class="index-selected">
-			<view class="index-time">
-				<block v-for="v in timeList" :key="v.value">
-					<view class="time-item flex-center" :class="{ 'time-active': vdata.timeSelected == v.value }"
-						@tap.stop="changeTimeFunc(v.value)">
-						{{ v.title }}
-					</view>
-				</block>
-			</view>
-			<view class="index-scan flex-center" @click.stop="scanFunc">
-				<image src="/static/iconImg/icon-scan-index.svg" mode="scaleToFill" />
-			</view>
-		</view>
-		<view class="receipts-money">
-			<text class="money-title">成交金额 (元)</text>
-			<view class="money-num">{{ list?list.sale.incomeAmountAll:0}}</view>
-		</view>
-		<view class="money-list">
-			<view class="money-item">
-				<text class="money-title">消费笔数</text>
-				<view class="money-num">{{ list?list.vip.useNum:0 }}</view>
-			</view>
-			<view class="money-item">
-				<text class="money-title">退款金额 (元)</text>
-				<view class="money-num">{{ list?list.sale.outAmount:0}}</view>
-			</view>
-			<view class="money-item">
-				<text class="money-title">消费金额</text>
-				<view class="money-num">{{ list?list.vip.useAmount:0 }}</view>
-			</view>
-		</view>
-		<view class="money-list" v-if="vdata.memberIsShow">
-			<view class="money-item">
-				<text class="money-title">会员充值(元)</text>
-				<view class="money-num">{{ cal.cert2Dollar(memberData.payAmount) }}</view>
-			</view>
-			<view class="money-item">
-				<text class="money-title">会员消费(元)</text>
-				<view class="money-num">{{ cal.cert2Dollar(Math.abs(memberData.changeAmount)) }}</view>
-			</view>
+  <view class="index-header" @tap="go.to('PAGES_STAT')">
+    <view class="index-selected">
+      <view class="index-time">
+        <block v-for="v in timeList" :key="v.value">
+          <view
+            class="time-item flex-center"
+            :class="{ 'time-active': vdata.timeSelected == v.value }"
+            @tap.stop="changeTimeFunc(v.value)"
+          >
+            {{ v.title }}
+          </view>
+        </block>
+      </view>
+      <view class="index-scan flex-center" @click.stop="scanFunc">
+        <image src="/static/iconImg/icon-scan-index.svg" mode="scaleToFill" />
+      </view>
+    </view>
+    <view class="receipts-money">
+      <text class="money-title">成交金额 (元)</text>
+      <view class="money-num">{{ list ? list.sale.incomeAmountAll : 0 }}</view>
+    </view>
+    <view class="money-list">
+      <view class="money-item">
+        <text class="money-title">消费笔数</text>
+        <view class="money-num">{{ list ? list.vip.useNum : 0 }}</view>
+      </view>
+      <view class="money-item">
+        <text class="money-title">退款金额 (元)</text>
+        <view class="money-num">{{ list ? list.sale.outAmount : 0 }}</view>
+      </view>
+      <view class="money-item">
+        <text class="money-title">消费金额</text>
+        <view class="money-num">{{ list ? list.vip.useAmount : 0 }}</view>
+      </view>
+    </view>
+    <view class="money-list" v-if="vdata.memberIsShow">
+      <view class="money-item">
+        <text class="money-title">会员充值(元)</text>
+        <view class="money-num">{{
+          cal.cert2Dollar(memberData.payAmount)
+        }}</view>
+      </view>
+      <view class="money-item">
+        <text class="money-title">会员消费(元)</text>
+        <view class="money-num">{{
+          cal.cert2Dollar(Math.abs(memberData.changeAmount))
+        }}</view>
+      </view>
 
-			<view class="money-item">
-				<text class="money-title">会员消费笔数</text>
-				<view class="money-num">{{ memberData.changeCount }}</view>
-			</view>
-		</view>
-		<view>
-			<!-- <text class="money-title">展开全部</text> -->
-		</view>
-	</view>
+      <view class="money-item">
+        <text class="money-title">会员消费笔数</text>
+        <view class="money-num">{{ memberData.changeCount }}</view>
+      </view>
+    </view>
+    <view>
+      <!-- <text class="money-title">展开全部</text> -->
+    </view>
+  </view>
 </template>
 
 <script setup>
-	import { ref, reactive, onMounted } from 'vue';
+import { ref, reactive, onMounted } from "vue";
 
-	import cal from '@/commons/utils/cal.js';
-	import go from '@/commons/utils/go.js';
-	import ent from '@/commons/utils/ent.js';
-	import unionScan from '@/commons/utils/unionScan.js';
-	import storageManage from '@/commons/utils/storageManage.js';
-	import dayjs from 'dayjs' //时间格式库
+import cal from "@/commons/utils/cal.js";
+import go from "@/commons/utils/go.js";
+import ent from "@/commons/utils/ent.js";
+import unionScan from "@/commons/utils/unionScan.js";
+import storageManage from "@/commons/utils/storageManage.js";
+import dayjs from "dayjs"; //时间格式库
+import { timeList } from '@/data/index.js'
 
-	import { getTrade } from '@/http/api/summary.js'
-	onMounted(() => {
-		vdata.memberIsShow = ent.has('ENT_MCH_MEMBER') && storageManage.userInfo().isHasMemberEnt;
-		if (ent.has('ENT_MCH_MEMBER') && storageManage.userInfo().isHasMemberEnt) {
-			getMemberData();
-		}
-		getList()
-	});
-	const emits = defineEmits(['click']);
-	const timeList = [{
-			title: '今天',
-			value: 'today'
-		},
-		{
-			title: '昨天',
-			value: 'yesterday'
-		},
-		{
-			title: '近7天',
-			value: 'circumference'
-		},
-		{
-			title: '近30天',
-			value: 'moon'
-		}
-	];
-	let list = ref()
-	const vdata = reactive({
-		timeSelected: 'today', // 当前时间选择器的
-		payAmount: -1, // 实收金额
-		payCount: -1, // 交易笔数
-		refundAmount: -1, // 退款金额
-		refundCount: -1, // 退款笔数
-		memberIsShow: false //是否开启会员模块
-	});
-	const memberData = reactive({});
+import { getTrade } from "@/http/api/summary.js";
+onMounted(() => {
+  vdata.memberIsShow =
+    ent.has("ENT_MCH_MEMBER") && storageManage.userInfo().isHasMemberEnt;
+  if (ent.has("ENT_MCH_MEMBER") && storageManage.userInfo().isHasMemberEnt) {
+    getMemberData();
+  }
+  getList();
+});
+const emits = defineEmits(["click"]);
+let list = ref();
+const vdata = reactive({
+  timeSelected: "today", // 当前时间选择器的
+  payAmount: -1, // 实收金额
+  payCount: -1, // 交易笔数
+  refundAmount: -1, // 退款金额
+  refundCount: -1, // 退款笔数
+  memberIsShow: false, //是否开启会员模块
+});
+const memberData = reactive({});
 
-	function getList() {
-		let startTime, endTime;
-		if (vdata.timeSelected == 'today') {
-			startTime = dayjs().format('YYYY-MM-DD') + ' 00:00:00'
-			endTime = dayjs().format('YYYY-MM-DD') + ' 23:59:59'
-		} else if (vdata.timeSelected == 'yesterday') {
-			startTime = formatTime() + ' 00:00:00'
-			endTime = formatTime() + ' 23:59:59'
-		} else if (vdata.timeSelected == 'circumference') {
-			startTime = dayjs().add(-7, 'day').format('YYYY-MM-DD 00:00:00')
-			endTime = dayjs().format('YYYY-MM-DD 23:59:59')
-		} else if (vdata.timeSelected == 'moon') {
-			startTime = dayjs().add(-30, 'day').format('YYYY-MM-DD 00:00:00')
-			endTime = dayjs().format('YYYY-MM-DD 23:59:59')
-		} else if (vdata.timeSelected == 'custom') {
-			startTime = start
-			endTime = end
-		}
-		getTrade({
-			shopId: uni.getStorageSync('shopId'),
-			startTime,
-			endTime,
-		}).then((res) => {
-			list.value = res
-		})
-	}
-	// 切换 时间卡片
-	function changeTimeFunc(val) {
-		vdata.timeSelected = val;
-		getList()
-		// refData();
-		// if (vdata.memberIsShow) {
-		// 	getMemberData();
-		// }
-	}
-	// 根据选择请求数据
-	function refData() {
-		// 获取 统计数据
-		// $indexStatistics(vdata.timeSelected).then(({
-		// 	bizData
-		// }) => {
-		// 	vdata.payAmount = bizData.totalSuccAmt;
-		// 	vdata.payCount = bizData.totalSuccNum;
-		// 	vdata.refundAmount = bizData.totalRefundAmt;
-		// 	vdata.refundCount = bizData.totalRefundNum;
-		// });
-	}
+function getList() {
+  let startTime, endTime;
+  if (vdata.timeSelected == "today") {
+    startTime = dayjs().format("YYYY-MM-DD") + " 00:00:00";
+    endTime = dayjs().format("YYYY-MM-DD") + " 23:59:59";
+  } else if (vdata.timeSelected == "yesterday") {
+    startTime = formatTime() + " 00:00:00";
+    endTime = formatTime() + " 23:59:59";
+  } else if (vdata.timeSelected == "circumference") {
+    startTime = dayjs().add(-7, "day").format("YYYY-MM-DD 00:00:00");
+    endTime = dayjs().format("YYYY-MM-DD 23:59:59");
+  } else if (vdata.timeSelected == "moon") {
+    startTime = dayjs().add(-30, "day").format("YYYY-MM-DD 00:00:00");
+    endTime = dayjs().format("YYYY-MM-DD 23:59:59");
+  } else if (vdata.timeSelected == "custom") {
+    startTime = start;
+    endTime = end;
+  }
+  getTrade({
+    shopId: uni.getStorageSync("shopId"),
+    startTime,
+    endTime,
+  }).then((res) => {
+    list.value = res;
+  });
+}
+// 切换 时间卡片
+function changeTimeFunc(val) {
+  vdata.timeSelected = val;
+  getList();
+  // refData();
+  // if (vdata.memberIsShow) {
+  // 	getMemberData();
+  // }
+}
+// 根据选择请求数据
+function refData() {
+  // 获取 统计数据
+  // $indexStatistics(vdata.timeSelected).then(({
+  // 	bizData
+  // }) => {
+  // 	vdata.payAmount = bizData.totalSuccAmt;
+  // 	vdata.payCount = bizData.totalSuccNum;
+  // 	vdata.refundAmount = bizData.totalRefundAmt;
+  // 	vdata.refundCount = bizData.totalRefundNum;
+  // });
+}
 
-	// 扫码动作
-	function scanFunc() {
-		unionScan.scan(true).then((res) => {
-			// 登录类型
-			if (res.type == unionScan.QR_TYPE_LOGIN) {
-				return go.to('PAGES_SCAN_LOGIN', {
-					qrcodeNo: res.originQrVal
-				});
-			}
+// 扫码动作
+function scanFunc() {
+  unionScan.scan(true).then((res) => {
+    // 登录类型
+    if (res.type == unionScan.QR_TYPE_LOGIN) {
+      return go.to("PAGES_SCAN_LOGIN", {
+        qrcodeNo: res.originQrVal,
+      });
+    }
 
-			// 二维码
-			if (res.type == unionScan.QR_TYPE_QRC) {
-				return go.to('PAGES_APP_CODE_BIND', {
-					qrcId: res.bizValue
-				});
-			}
-		});
-	}
-	// 获取当前时间
-	function getdate() {
-		const dt = new Date();
-		const y = dt.getFullYear();
-		const m = (dt.getMonth() + 1 + "").padStart(2, "0");
-		const d = (dt.getDate() + "").padStart(2, "0");
-		const hh = (dt.getHours() + "").padStart(2, "0");
-		const mm = (dt.getMinutes() + "").padStart(2, "0");
-		const ss = (dt.getSeconds() + "").padStart(2, "0");
-		return `${y}-${m}-${d}`;
-	}
-	// 获取昨天时间
-	const formatTime = () => {
-		let strDate = getdate()
-		let dateFormat = new Date(strDate);
-		dateFormat = dateFormat.setDate(dateFormat.getDate() - 1);
-		dateFormat = new Date(dateFormat);
-		let y = dateFormat.getFullYear()
-		let m = (dateFormat.getMonth() + 1).toString().padStart(2, '0')
-		let d = dateFormat.getDate().toString().padStart(2, '0')
-		return `${y}-${m}-${d}`
-	}
-	const getMemberData = () => {
-		// $memberInfoCount({
-		// 	queryDateRange: vdata.timeSelected
-		// }).then(({
-		// 	bizData
-		// }) => {
-		// 	Object.assign(memberData, bizData);
-		// });
-	};
-	defineExpose({
-		refData
-	});
+    // 二维码
+    if (res.type == unionScan.QR_TYPE_QRC) {
+      return go.to("PAGES_APP_CODE_BIND", {
+        qrcId: res.bizValue,
+      });
+    }
+  });
+}
+// 获取当前时间
+function getdate() {
+  const dt = new Date();
+  const y = dt.getFullYear();
+  const m = (dt.getMonth() + 1 + "").padStart(2, "0");
+  const d = (dt.getDate() + "").padStart(2, "0");
+  const hh = (dt.getHours() + "").padStart(2, "0");
+  const mm = (dt.getMinutes() + "").padStart(2, "0");
+  const ss = (dt.getSeconds() + "").padStart(2, "0");
+  return `${y}-${m}-${d}`;
+}
+// 获取昨天时间
+const formatTime = () => {
+  let strDate = getdate();
+  let dateFormat = new Date(strDate);
+  dateFormat = dateFormat.setDate(dateFormat.getDate() - 1);
+  dateFormat = new Date(dateFormat);
+  let y = dateFormat.getFullYear();
+  let m = (dateFormat.getMonth() + 1).toString().padStart(2, "0");
+  let d = dateFormat.getDate().toString().padStart(2, "0");
+  return `${y}-${m}-${d}`;
+};
+const getMemberData = () => {
+  // $memberInfoCount({
+  // 	queryDateRange: vdata.timeSelected
+  // }).then(({
+  // 	bizData
+  // }) => {
+  // 	Object.assign(memberData, bizData);
+  // });
+};
+defineExpose({
+  refData,
+});
 </script>
 
 <style lang="scss" scoped>
-	.index-header {
-		width: 680rpx;
-		margin: 0 auto;
-		transform: translateY(30rpx);
-		margin-bottom: 25rpx;
-		padding: 20rpx;
-		box-sizing: border-box;
-		border-radius: $J-b-r32;
-		background: $jeepay-bg-primary;
-		backdrop-filter: blur(20rpx);
-		box-shadow: 0 50rpx 70rpx -60rpx rgba(0, 65, 164, 0.5);
+.index-header {
+  width: 680rpx;
+  margin: 0 auto;
+  transform: translateY(30rpx);
+  margin-bottom: 25rpx;
+  padding: 20rpx;
+  box-sizing: border-box;
+  border-radius: $J-b-r32;
+  background: $jeepay-bg-primary;
+  backdrop-filter: blur(20rpx);
+  box-shadow: 0 50rpx 70rpx -60rpx rgba(0, 65, 164, 0.5);
 
-		.index-selected {
-			display: flex;
-			justify-content: space-between;
+  .index-selected {
+    display: flex;
+    justify-content: space-between;
 
-			.index-time {
-				display: flex;
-				justify-content: space-between;
-				align-items: center;
-				width: 490rpx;
-				height: 90rpx;
-				border-radius: 20rpx;
-				padding: 10rpx;
-				background-color: rgba($color: #fff, $alpha: 0.1);
+    .index-time {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      width: 490rpx;
+      height: 90rpx;
+      border-radius: 20rpx;
+      padding: 10rpx;
+      background-color: rgba($color: #fff, $alpha: 0.1);
 
-				.time-item {
-					flex: 1;
-					// width: 120rpx;
-					height: 100%;
-					font-size: 32rpx;
-					font-weight: 500;
-					color: rgba(255, 255, 255, 0.75);
-				}
+      .time-item {
+        flex: 1;
+        // width: 120rpx;
+        height: 100%;
+        font-size: 32rpx;
+        font-weight: 500;
+        color: rgba(255, 255, 255, 0.75);
+      }
 
-				.time-active {
-					background-color: $J-bg-ff;
-					color: $J-color-t21;
-					border-radius: 12rpx;
-				}
-			}
+      .time-active {
+        background-color: $J-bg-ff;
+        color: $J-color-t21;
+        border-radius: 12rpx;
+      }
+    }
 
-			.index-scan {
-				width: 110rpx;
-				height: 110rpx;
-				border-radius: 20rpx;
-				background-color: rgba($color: #fff, $alpha: 0.1);
+    .index-scan {
+      width: 110rpx;
+      height: 110rpx;
+      border-radius: 20rpx;
+      background-color: rgba($color: #fff, $alpha: 0.1);
 
-				image {
-					width: 41rpx;
-					height: 35rpx;
-				}
-			}
-		}
+      image {
+        width: 41rpx;
+        height: 35rpx;
+      }
+    }
+  }
 
-		.receipts-money {
-			display: flex;
-			flex-direction: column;
-			align-items: center;
-			margin: 30rpx 0;
-			color: $J-color-tff;
+  .receipts-money {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    margin: 30rpx 0;
+    color: $J-color-tff;
 
-			.money-num {
-				font-size: 70rpx;
-				font-weight: 500;
-			}
-		}
+    .money-num {
+      font-size: 70rpx;
+      font-weight: 500;
+    }
+  }
 
-		.money-list {
-			display: flex;
-			justify-content: space-between;
-			padding: 0 72rpx;
-			margin-bottom: 50rpx;
-			text-align: center;
-			color: $J-color-tff;
+  .money-list {
+    display: flex;
+    justify-content: space-between;
+    padding: 0 72rpx;
+    margin-bottom: 50rpx;
+    text-align: center;
+    color: $J-color-tff;
 
-			.money-item {
-				.money-num {
-					font-size: 32rpx;
-					font-weight: 500;
-				}
-			}
-		}
+    .money-item {
+      .money-num {
+        font-size: 32rpx;
+        font-weight: 500;
+      }
+    }
+  }
 
-		.money-title {
-			margin-bottom: 10rpx;
-			font-size: 26rpx;
-			font-weight: 400;
-			color: $J-color-tSff;
-		}
+  .money-title {
+    margin-bottom: 10rpx;
+    font-size: 26rpx;
+    font-weight: 400;
+    color: $J-color-tSff;
+  }
 
-		.quick-money {
-			height: 110rpx;
-			border-radius: 20rpx;
-			color: $J-color-t29;
-		}
-	}
-</style>
\ No newline at end of file
+  .quick-money {
+    height: 110rpx;
+    border-radius: 20rpx;
+    color: $J-color-t29;
+  }
+}
+</style>
diff --git a/pages/index/components/my-date-pickerview.vue b/pages/index/components/my-date-pickerview.vue
index 1e8085d..af81cb9 100644
--- a/pages/index/components/my-date-pickerview.vue
+++ b/pages/index/components/my-date-pickerview.vue
@@ -1,30 +1,40 @@
 <template>
-	<view class="mask" v-if="show" @tap="close">
-		<view class="box" @tap.stop="nullFunction">
-			<view class="u-flex u-relative u-row-center u-p-30 top">
-				<view class="font-bold u-font-32">筛选日期时间</view>
-				<view class="close" @tap="close">
-					<uni-icons type="closeempty" size="24"></uni-icons>
-				</view>
-
-			</view>
-			<!-- 	<view class="u-p-30 u-flex u-flex-wrap gap-20 fastTime">
+  <view class="mask" v-if="show" @tap="close">
+    <view class="box" @tap.stop="nullFunction">
+      <view class="u-flex u-relative u-row-center u-p-30 top">
+        <view class="font-bold u-font-32">筛选日期时间</view>
+        <view class="close" @tap="close">
+          <uni-icons type="closeempty" size="24"></uni-icons>
+        </view>
+      </view>
+      <!-- 	<view class="u-p-30 u-flex u-flex-wrap gap-20 fastTime">
 					<view class="item" v-for="(item,index) in fastTime" :key="index" @tap="changeTime(item.key)">
 						{{item.title}}
 					</view>
 				</view> -->
-			<picker-view :immediate-change="true" @pickend="pickend" :value="value" @change="bindChange"
-				class="picker-view">
-				<picker-view-column>
-					<view class="item" v-for="(item,index) in years" :key="index">{{item}}年</view>
-				</picker-view-column>
-				<picker-view-column>
-					<view class="item" v-for="(item,index) in months" :key="index">{{item}}月</view>
-				</picker-view-column>
-				<picker-view-column>
-					<view class="item" v-for="(item,index) in days" :key="index">{{item}}日</view>
-				</picker-view-column>
-		<!-- 		<picker-view-column>
+      <picker-view
+        :immediate-change="true"
+        @pickend="pickend"
+        :value="value"
+        @change="bindChange"
+        class="picker-view"
+      >
+        <picker-view-column>
+          <view class="item" v-for="(item, index) in years" :key="index"
+            >{{ item }}年</view
+          >
+        </picker-view-column>
+        <picker-view-column>
+          <view class="item" v-for="(item, index) in months" :key="index"
+            >{{ item }}月</view
+          >
+        </picker-view-column>
+        <picker-view-column>
+          <view class="item" v-for="(item, index) in days" :key="index"
+            >{{ item }}日</view
+          >
+        </picker-view-column>
+        <!-- 		<picker-view-column>
 					<view class="item" v-for="(item,index) in hours" :key="index">{{item}}时</view>
 				</picker-view-column>
 				<picker-view-column>
@@ -33,20 +43,31 @@
 				<picker-view-column>
 					<view class="item" v-for="(item,index) in seconds" :key="index">{{item}}秒</view>
 				</picker-view-column> -->
-			</picker-view>
-			<view class="u-text-center color-999">至</view>
-			<picker-view :immediate-change="true" :value="value1" @pickend="pickend1" @change="bindChange1"
-				class="picker-view">
-				<picker-view-column>
-					<view class="item" v-for="(item,index) in years" :key="index">{{item}}年</view>
-				</picker-view-column>
-				<picker-view-column>
-					<view class="item" v-for="(item,index) in months" :key="index">{{item}}月</view>
-				</picker-view-column>
-				<picker-view-column>
-					<view class="item" v-for="(item,index) in days1" :key="index">{{item}}日</view>
-				</picker-view-column>
-<!-- 				<picker-view-column>
+      </picker-view>
+      <view class="u-text-center color-999">至</view>
+      <picker-view
+        :immediate-change="true"
+        :value="value1"
+        @pickend="pickend1"
+        @change="bindChange1"
+        class="picker-view"
+      >
+        <picker-view-column>
+          <view class="item" v-for="(item, index) in years" :key="index"
+            >{{ item }}年</view
+          >
+        </picker-view-column>
+        <picker-view-column>
+          <view class="item" v-for="(item, index) in months" :key="index"
+            >{{ item }}月</view
+          >
+        </picker-view-column>
+        <picker-view-column>
+          <view class="item" v-for="(item, index) in days1" :key="index"
+            >{{ item }}日</view
+          >
+        </picker-view-column>
+        <!-- 				<picker-view-column>
 					<view class="item" v-for="(item,index) in hours" :key="index">{{item}}时</view>
 				</picker-view-column>
 				<picker-view-column>
@@ -55,394 +76,403 @@
 				<picker-view-column>
 					<view class="item" v-for="(item,index) in seconds" :key="index">{{item}}秒</view>
 				</picker-view-column> -->
-			</picker-view>
-
-			<!-- 站位 -->
-			<view style="height: 80px;"></view>
-			<view class="fixed_b">
-				<my-button shape="circle" @tap="confirm">确定</my-button>
-			</view>
-		</view>
-
-	</view>
+      </picker-view>
 
+      <!-- 站位 -->
+      <view style="height: 80px"></view>
+      <view class="fixed_b">
+        <my-button shape="circle" @tap="confirm">确定</my-button>
+      </view>
+    </view>
+  </view>
 </template>
 
 <script setup>
-	import myButton from "@/components/my-components/my-button.vue"
-	import {
-		reactive,
-		ref
-	} from 'vue';
-	const $nowDate = new Date()
-	const nowDate = {
-		year: $nowDate.getFullYear(),
-		month: $nowDate.getMonth() + 1,
-		day: $nowDate.getDate(),
-		hours: $nowDate.getHours(),
-		minutes: $nowDate.getMinutes(),
-		seconds: $nowDate.getSeconds()
-	}
-	const yearsLen = 30
-	const years = new Array(yearsLen).fill(1).map((v, index) => {
-		return nowDate.year - index
-	}).reverse()
-	const months = new Array(12).fill(1).map((v, index) => {
-		return index + 1
-	})
-	const days = ref(new Array(getMonthArea($nowDate, 'end').getDate()).fill(1).map((v, index) => {
-		return index + 1
-	}))
-	const days1 = ref(new Array(getMonthArea($nowDate, 'end').getDate()).fill(1).map((v, index) => {
-		return index + 1
-	}))
-	const hours = new Array(24).fill(1).map((v, index) => {
-		return index
-	})
-	const minutes = new Array(60).fill(1).map((v, index) => {
-		return index
-	})
-	const seconds = new Array(60).fill(1).map((v, index) => {
-		return index
-	})
-	const fastTime = reactive([{
-			title: '今日',
-			key: 'now'
-		},
-		{
-			title: '昨日',
-			key: 'prve'
-		},
-		{
-			title: '本月',
-			key: 'nowMonth'
-		},
-		{
-			title: '上月',
-			key: 'prveMonth'
-		}
-	])
+import myButton from "@/components/my-components/my-button.vue";
+import { reactive, ref } from "vue";
+const $nowDate = new Date();
+const nowDate = {
+  year: $nowDate.getFullYear(),
+  month: $nowDate.getMonth() + 1,
+  day: $nowDate.getDate(),
+  hours: $nowDate.getHours(),
+  minutes: $nowDate.getMinutes(),
+  seconds: $nowDate.getSeconds(),
+};
+const yearsLen = 30;
+const years = new Array(yearsLen)
+  .fill(1)
+  .map((v, index) => {
+    return nowDate.year - index;
+  })
+  .reverse();
+const months = new Array(12).fill(1).map((v, index) => {
+  return index + 1;
+});
+const days = ref(
+  new Array(getMonthArea($nowDate, "end").getDate()).fill(1).map((v, index) => {
+    return index + 1;
+  })
+);
+const days1 = ref(
+  new Array(getMonthArea($nowDate, "end").getDate()).fill(1).map((v, index) => {
+    return index + 1;
+  })
+);
+const hours = new Array(24).fill(1).map((v, index) => {
+  return index;
+});
+const minutes = new Array(60).fill(1).map((v, index) => {
+  return index;
+});
+const seconds = new Array(60).fill(1).map((v, index) => {
+  return index;
+});
+const fastTime = reactive([
+  {
+    title: "今日",
+    key: "now",
+  },
+  {
+    title: "昨日",
+    key: "prve",
+  },
+  {
+    title: "本月",
+    key: "nowMonth",
+  },
+  {
+    title: "上月",
+    key: "prveMonth",
+  },
+]);
 
+function setPrveDay() {}
 
+function setNowMoneth() {}
 
-	function setPrveDay() {
+function setprveMoneth() {}
 
-	}
+function setDay(start, end) {
+  value.value = [start.year, start.month, start.day, 0, 0, 0];
+  value1.value = [end.year, end.month, end.day, 23, 59, 59];
+}
 
-	function setNowMoneth() {
+function changeTime(key) {
+  const yearIndex = years.findIndex((v) => v == nowDate.year);
+  const prveyearIndex = years.findIndex((v) => v == nowDate.year) - 1;
+  const nowMonthIndex = nowDate.month - 1;
+  const nowDayIndex = nowDate.day - 1;
+  const dataMap = {
+    now: function () {
+      return {
+        start: {
+          year: yearIndex,
+          month: nowMonthIndex,
+          day: nowDayIndex,
+        },
+        end: {
+          year: yearIndex,
+          month: nowMonthIndex,
+          day: nowDayIndex,
+        },
+      };
+    },
+    prve: function () {
+      const oneDay = 1000 * 60 * 60 * 24;
+      const date = new Date(
+        new Date(nowDate.year, nowDate.month, nowDate.day, 0, 0, 0).getTime() -
+          oneDay
+      );
+      return {
+        start: {
+          year: years.findIndex((v) => v == date.getFullYear()),
+          month: date.getMonth() - 1 < 0 ? 11 : date.getMonth() - 1,
+          day: date.getDate() - 1,
+        },
+        end: {
+          year: years.findIndex((v) => v == date.getFullYear()),
+          month: date.getMonth() - 1 < 0 ? 11 : date.getMonth() - 1,
+          day: date.getDate() - 1,
+        },
+      };
+    },
+    nowMonth: function () {
+      return {
+        start: {
+          year: yearIndex,
+          month: nowMonthIndex,
+          day: 0,
+        },
+        end: {
+          year: yearIndex,
+          month: nowMonthIndex,
+          day: new Date(nowDate.year, nowDate.month, 0).getDate() - 1,
+        },
+      };
+    },
+    prveMonth: function () {
+      const oneDay = 1000 * 60 * 60 * 24;
+      const date = new Date(
+        new Date(nowDate.year, nowDate.month - 1, 0, 0, 0).getTime() - oneDay
+      );
+      console.log(date.getMonth());
+      return {
+        start: {
+          year: years.findIndex((v) => v == date.getFullYear()),
+          month: date.getMonth(),
+          day: 0,
+        },
+        end: {
+          year: years.findIndex((v) => v == date.getFullYear()),
+          month: date.getMonth(),
+          day: date.getDate(),
+        },
+      };
+    },
+  };
+  const data = dataMap[key]();
+  setDay(data.start, data.end);
+  changeDays(false, value.value);
+  changeDays(true, value1.value);
 
-	}
+  console.log(value1.value);
+  const start = returnDateString(value.value);
+  const end = returnDateString(value1.value);
 
-	function setprveMoneth() {
+  emits("confirm", {
+    text: `${start}——${end}`,
+    start,
+    end,
+  });
+  close();
+}
+let value = ref([
+  years.length - 1,
+  nowDate.month - 1,
+  nowDate.day - 1,
+  0,
+  0,
+  0,
+]);
+let value1 = ref([
+  years.length - 1,
+  nowDate.month - 1,
+  nowDate.day - 1,
+  23,
+  59,
+  59,
+]);
 
-	}
+let show = ref(false);
+const emits = defineEmits("close", "open", "confirm");
 
+function toggle() {
+  show.value = !show.value;
+  if (show.value) {
+    emits("open", true);
+  } else {
+    emits("close", false);
+  }
+}
 
-	function setDay(start, end) {
-		value.value = [
-			start.year,
-			start.month,
-			start.day,
-			0,
-			0,
-			0,
-		]
-		value1.value = [
-			end.year,
-			end.month,
-			end.day,
-			23,
-			59,
-			59,
-		]
-	}
+function close() {
+  show.value = false;
+  emits("close", false);
+}
 
-	function changeTime(key) {
-		const yearIndex = years.findIndex(v => v == nowDate.year)
-		const prveyearIndex = years.findIndex(v => v == nowDate.year) - 1
-		const nowMonthIndex = nowDate.month - 1
-		const nowDayIndex = nowDate.day - 1
-		const dataMap = {
-			now: function() {
-				return {
-					start: {
-						year: yearIndex,
-						month: nowMonthIndex,
-						day: nowDayIndex
-					},
-					end: {
-						year: yearIndex,
-						month: nowMonthIndex,
-						day: nowDayIndex
-					}
-				}
-			},
-			prve: function() {
-				const oneDay=1000*60*60*24
-				const date=new Date(new Date(nowDate.year,nowDate.month,nowDate.day,0,0,0).getTime()-oneDay) 
-				return {
-					start: {
-						year:years.findIndex(v=>v==date.getFullYear()),
-						month:date.getMonth()-1<0?11:date.getMonth()-1,
-						day: date.getDate()-1
-					},
-					end: {
-						year:years.findIndex(v=>v==date.getFullYear()),
-						month:date.getMonth()-1<0?11:date.getMonth()-1,
-						day: date.getDate()-1
-					}
-				}
-			},
-			nowMonth: function() {
-				return {
-					start: {
-						year:yearIndex,
-						month:nowMonthIndex,
-						day: 0
-					},
-					end: {
-						year:yearIndex,
-						month:nowMonthIndex,
-						day:new Date(nowDate.year, nowDate.month , 0).getDate() - 1
-					}
-				}
-			},
-			prveMonth: function() {
-				const oneDay=1000*60*60*24
-				const date=new Date(new Date(nowDate.year, nowDate.month-1,0,0,0).getTime()-oneDay) 
-				console.log(date.getMonth());
-				return {
-					start: {
-						year:years.findIndex(v=>v==date.getFullYear()),
-						month:date.getMonth(),
-						day: 0
-					},
-					end: {
-						year:years.findIndex(v=>v==date.getFullYear()),
-						month:date.getMonth(),
-						day: date.getDate()
-					}
-				}
-			}
-		}
-		const data = dataMap[key]()
-		setDay(data.start, data.end)
-		changeDays(false,value.value)
-		changeDays(true,value1.value)
-		
-		console.log(value1.value);
-		const start = returnDateString(value.value)
-		const end = returnDateString(value1.value)
-		
-		emits('confirm', {
-			text: `${start}——${end}`,
-			start,
-			end
-		})
-		close()
-	}
-	let value = ref([
-		years.length - 1,
-		nowDate.month - 1,
-		nowDate.day - 1,
-		0,
-		0,
-		0,
-	])
-	let value1 = ref([
-		years.length - 1,
-		nowDate.month - 1,
-		nowDate.day - 1,
-		23,
-		59,
-		59,
-	])
+function open() {
+  show.value = true;
+  emits("open", true);
+}
 
-	let show = ref(false)
-	const emits = defineEmits('close', 'open', 'confirm')
+function returnDateString(arr) {
+  const year = years[arr[0]];
+  const month = ("0" + (arr[1] + 1)).slice(-2);
+  const day = ("0" + (arr[2] + 1)).slice(-2);
+  const hour = ("0" + arr[3]).slice(-2);
+  const min = ("0" + arr[4]).slice(-2);
+  const sen = ("0" + arr[5]).slice(-2);
 
-	function toggle() {
-		show.value = !show.value
-		if (show.value) {
-			emits('open', true)
-		} else {
-			emits('close', false)
-		}
-	}
+  return `${year}-${month}-${day} ${hour}:${min}:${sen}`;
+}
 
-	function close() {
-		show.value = false
-		emits('close', false)
-	}
+function confirm(e) {
+  const start = returnDateString(value.value);
+  const end = returnDateString(value1.value);
+  console.log(start);
+  console.log(end);
+  //如果结尾时间小于开始时间
+  if (new Date(start).getTime() > new Date(end).getTime()) {
+    return uni.showToast({
+      title: "结束时间不能小于开始时间",
+      icon: "none",
+    });
+  }
+  console.log(start);
+  console.log(end);
+  emits("confirm", {
+    text: `${start}——${end}`,
+    start,
+    end,
+  });
+  close();
+}
 
-	function open() {
-		show.value = true
-		emits('open', true)
-	}
+function returnMonthStart(arr) {
+  return new Date(years[arr[0]], months[arr[1]] - 1, 1).getDate();
+}
 
-	function returnDateString(arr) {
-		const year = years[arr[0]]
-		const month = arr[1] + 1
-		const day = arr[2] + 1
-		const hour = ('0' + arr[3]).slice(-2)
-		const min = ('0' + arr[4]).slice(-2)
-		const sen = ('0' + arr[5]).slice(-2)
-		return `${year}-${month}-${day} ${hour}:${min}:${sen}`
-	}
+function returnMonthEnd(arr) {
+  return new Date(years[arr[0]], months[arr[1]], 0).getDate();
+}
 
+function changeDays(isDays1, arr) {
+  const end = returnMonthEnd(arr);
+  if (end) {
+    if (isDays1) {
+      days1.value = new Array(end).fill(1).map((v, index) => {
+        return index + 1;
+      });
+    } else {
+      days.value = new Array(end).fill(1).map((v, index) => {
+        return index + 1;
+      });
+    }
+  }
+}
 
-	function confirm(e) {
-		const start = returnDateString(value.value)
-		const end = returnDateString(value1.value)
-		console.log(start);
-		console.log(end);
-		emits('confirm', {
-			text: `${start}——${end}`,
-			start,
-			end
-		})
-		close()
-	}
+function bindChange(e) {
+  value.value = e.detail.value;
+  changeDays(false, e.detail.value);
+}
 
-	function returnMonthStart(arr) {
-		return new Date(years[arr[0]], months[arr[1]] - 1, 1).getDate();
-	}
+function bindChange1(e) {
+  value1.value = e.detail.value;
+  changeDays(true, e.detail.value);
+}
 
-	function returnMonthEnd(arr) {
-		return new Date(years[arr[0]], months[arr[1]], 0).getDate();
-	}
-	
-	function changeDays(isDays1,arr){
-		const end = returnMonthEnd(arr)
-		if (end) {
-			if(isDays1){
-				days1.value= new Array(end).fill(1).map((v,
-					index) => {
-					return index + 1
-				})
-			}else{
-				days.value= new Array(end).fill(1).map((v,
-					index) => {
-					return index + 1
-				})
-			}
-			
-		}
-	}
+function getDayDate(date = new Date(), type) {
+  const now = date;
+  if (type === "start") {
+    const startOfDay = new Date(
+      now.getFullYear(),
+      now.getMonth(),
+      now.getDate()
+    );
+    return startOfDay;
+  }
+  if (type === "end") {
+    const endOfDay = new Date(
+      now.getFullYear(),
+      now.getMonth(),
+      now.getDate(),
+      23,
+      59,
+      59,
+      999
+    );
+    return endOfDay;
+  }
+}
 
-	function bindChange(e) {
-		value.value = e.detail.value
-		changeDays(false, e.detail.value)
-	}
+function getMonthArea(date = new Date(), type) {
+  let now = date;
+  let currentMonthStart = new Date(now.getFullYear(), now.getMonth(), 1);
+  let currentMonthEnd = new Date(
+    now.getFullYear(),
+    now.getMonth() + 1,
+    0,
+    23,
+    59,
+    59,
+    999
+  );
+  if (type === "start") {
+    return currentMonthStart;
+  }
+  if (type === "end") {
+    return currentMonthEnd;
+  }
+  return {
+    start: currentMonthStart,
+    end: currentMonthEnd,
+  };
+}
 
-	function bindChange1(e) {
-		value1.value = e.detail.value
-		changeDays(true, e.detail.value)
-	}
+function nullFunction() {}
 
-	function getDayDate(date = new Date(), type) {
-		const now = date
-		if (type === 'start') {
-			const startOfDay = new Date(now.getFullYear(), now.getMonth(), now.getDate());
-			return startOfDay
-		}
-		if (type === 'end') {
-			const endOfDay = new Date(now.getFullYear(), now.getMonth(), now.getDate(), 23, 59, 59, 999);
-			return endOfDay;
-		}
-	}
+function pickend(e) {
+  console.log(e);
+}
 
-	function getMonthArea(date = new Date(), type) {
-		let now = date
-		let currentMonthStart = new Date(now.getFullYear(), now.getMonth(), 1);
-		let currentMonthEnd = new Date(now.getFullYear(), now.getMonth() + 1, 0, 23, 59, 59, 999);
-		if (type === 'start') {
-			return currentMonthStart
-		}
-		if (type === 'end') {
-			return currentMonthEnd;
-		}
-		return {
-			start: currentMonthStart,
-			end: currentMonthEnd
-		};
-	}
-
-	function nullFunction() {
-
-	}
-
-	function pickend(e) {
-		console.log(e);
-	}
-
-	function pickend1(e) {
-		console.log(e);
-	}
-	defineExpose({
-		close,
-		open,
-		confirm,
-		toggle
-	})
+function pickend1(e) {
+  console.log(e);
+}
+defineExpose({
+  close,
+  open,
+  confirm,
+  toggle,
+});
 </script>
 
 <style lang="scss">
-	.fastTime {
-		.item {
-			background-color: rgb(247, 247, 247);
-			padding: 6rpx 40rpx;
-			border-radius: 6rpx;
-			font-size: 32rpx;
-		}
-	}
+.fastTime {
+  .item {
+    background-color: rgb(247, 247, 247);
+    padding: 6rpx 40rpx;
+    border-radius: 6rpx;
+    font-size: 32rpx;
+  }
+}
 
-	.top {
-		border-bottom: 1px solid #eee;
-	}
+.top {
+  border-bottom: 1px solid #eee;
+}
 
-	.close {
-		position: absolute;
-		top: 50%;
-		transform: translateY(-50%);
-		right: 30rpx;
-	}
+.close {
+  position: absolute;
+  top: 50%;
+  transform: translateY(-50%);
+  right: 30rpx;
+}
 
-	.mask {
-		position: fixed;
-		left: 0;
-		right: 0;
-		bottom: 0;
-		top: 0;
-		background-color: rgba(0, 0, 0, .7);
-		z-index: 100;
-		.box {
-			position: absolute;
-			background-color: #fff;
-			bottom: 0;
-			left: 0;
-			right: 0;
-			border-radius: 16rpx 16rpx 0 0;
-		}
-	}
+.mask {
+  position: fixed;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  top: 0;
+  background-color: rgba(0, 0, 0, 0.7);
+  z-index: 100;
+  .box {
+    position: absolute;
+    background-color: #fff;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    border-radius: 16rpx 16rpx 0 0;
+  }
+}
 
-	.fixed_b {
-		position: absolute;
-		left: 0;
-		right: 0;
-		bottom: 0;
-		padding: 30rpx;
-		z-index: 100;
-		background-color: #fff;
-	}
+.fixed_b {
+  position: absolute;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  padding: 30rpx;
+  z-index: 100;
+  background-color: #fff;
+}
 
-	.picker-view {
-		width: 750rpx;
-		height: 300rpx;
-	}
+.picker-view {
+  width: 750rpx;
+  height: 300rpx;
+}
 
-	.item {
-		line-height: 34px;
-		text-align: center;
-	}
-</style>
\ No newline at end of file
+.item {
+  line-height: 34px;
+  text-align: center;
+}
+</style>
diff --git a/pages/index/components/statistics.vue b/pages/index/components/statistics.vue
index baf17ce..4c08745 100644
--- a/pages/index/components/statistics.vue
+++ b/pages/index/components/statistics.vue
@@ -1,59 +1,82 @@
 <template>
-	<view class="statistics">
-		<view class="title">
-			<text>数据统计</text>
-		</view>
-		<view class="statisticsBox">
-			<view class="time-wrapper u-m-l-10 u-m-r-10">
-				<view v-for="(v, i) in timeList" :key="i" class="timelistbox">
-					<view class="time-item" @tap="changeTime(v.value,i)" :class="{ 'time-selected':v.value==selected }">
-						{{v.label}}
-					</view>
-					<!-- <view class="xian" v-if="v.value==selected "> </view> -->
-				</view>
-			</view>
-			<view class="time_bootom_line">
-				<view class="block" :style="{
-					transform:'translateX('+comBlockX+'rpx) rotate(45deg) '
-				}"></view>
-			</view>
-			<view class="bottom"></view>
-			<div class="u-flex u-row-between u-font-28 color-333 ">
-				<div class="  u-flex-1 ">
+  <view class="statistics">
+    <view class="title">
+      <text>数据统计</text>
+    </view>
+    <view class="statisticsBox">
+      <view class="time-wrapper u-m-l-10 u-m-r-10">
+        <view v-for="(v, i) in timeList" :key="i" class="timelistbox">
+          <view
+            class="time-item"
+            @tap="changeTime(v.value, i)"
+            :class="[v.value == selected ? 'time-selected' : '']"
+          >
+            {{ v.label }}
+          </view>
+          <!-- <view class="xian" v-if="v.value==selected "> </view> -->
+        </view>
+      </view>
+      <view class="time_bootom_line">
+        <view
+          class="block"
+          :style="{
+            transform: 'translateX(' + comBlockX + 'rpx) rotate(45deg) ',
+          }"
+        ></view>
+      </view>
+      <view class="bottom"></view>
+      <div class="u-flex u-row-between u-font-28 color-333">
+        <div class="u-flex-1">
+          <view class="u-m-t-32">
+            <view class="">营业额</view>
+            <view class="u-m-t-16">
+              <up-text
+                bold
+                color="#318AFE"
+                size="20"
+                mode="price"
+                :text="yingyeE"
+              ></up-text>
+            </view>
+          </view>
+          <view class="u-m-t-20">
+            <view class="">退款</view>
+            <view class="u-m-t-14">
+              <up-text
+                color="#333"
+                size="14"
+                bold
+                mode="price"
+                :text="refundCount"
+              ></up-text>
+            </view>
+          </view>
+        </div>
+        <view class="line"></view>
+        <view class="payList u-flex-1 u-p-l-40">
+          <view
+            class="li w-full u-flex u-row-between u-font-24 color-333"
+            v-for="(item, index) in list"
+            :key="index"
+          >
+            <view class="u-flex">
+              <view
+                :style="returnColorStyle(item, index)"
+                class="circle"
+              ></view>
+              <view class="u-m-l-8">
+                {{ item.payType }}
+              </view>
+            </view>
 
-					<view class="u-m-t-32">
-						<view class="">营业额</view>
-						<view class="u-m-t-16">
-							<up-text bold color="#318AFE" size="20" mode="price" :text="yingyeE"></up-text>
-						</view>
-					</view>
-					<view class="u-m-t-20">
-						<view class="">退款</view>
-						<view class="u-m-t-14">
-							<up-text color="#333" size="14" bold mode="price" :text="refundCount"></up-text>
-						</view>
-					</view>
-				</div>
-				<view class="line"></view>
-				<view class="payList u-flex-1 u-p-l-40">
-					<view class="li w-full u-flex u-row-between u-font-24 color-333" v-for="(item,index) in list"
-						:key="index">
-						<view class="u-flex">
-							<view :style="returnColorStyle(item,index)" class="circle"></view>
-							<view class="u-m-l-8">
-								{{item.payType}}
-							</view>
-						</view>
+            <view style="text-align: center" class="u-m-t-6">
+              {{ item.payAmount }}
+            </view>
+          </view>
+        </view>
+      </div>
 
-						<view style="text-align: center;" class="u-m-t-6">
-							{{item.payAmount}}
-						</view>
-					</view>
-				</view>
-			</div>
-
-
-			<!-- <view class="u-m-t-8 u-flex u-row-center u-font-24 u-col-center color-666">
+      <!-- <view class="u-m-t-8 u-flex u-row-center u-font-24 u-col-center color-666">
 				<view class="u-flex" @click="toggleShowAll">
 					<view>{{!showAll?'展开全部':'收起全部' }}</view>
 					<view class="u-flex  u-col-center u-m-t-4 tranistion-2" :class="{rotate:showAll}">
@@ -61,355 +84,316 @@
 					</view>
 				</view>
 			</view> -->
-		</view>
-	</view>
-	<datePickerview @confirm="datePickerConfirm" ref="datePicker" style="z-index: 999;"></datePickerview>
+    </view>
+  </view>
+  <datePickerview
+    @confirm="datePickerConfirm"
+    ref="datePicker"
+    style="z-index: 999"
+  ></datePickerview>
 </template>
 
 <script setup>
-	import {
-		ref,
-		reactive,
-		computed
-	} from 'vue';
-	import {
-		onShow
-	} from '@dcloudio/uni-app';
+import { ref, reactive, computed } from "vue";
+import { onShow } from "@dcloudio/uni-app";
+import { timeList } from "@/data/index.js";
+import dayjs from "dayjs"; //时间格式库
+import datePickerview from "./my-date-pickerview.vue";
 
-	import dayjs from 'dayjs' //时间格式库
-	import datePickerview from './my-date-pickerview.vue'
+import { getTrade } from "@/http/api/summary.js";
 
-	import {
-		getTrade
-	} from '@/http/api/summary.js'
+let selected = ref("today");
+let showAll = ref(false);
+let list = ref();
+const pageData = reactive({
+  list: [
+    {
+      payType: "微信小程序",
+      key: "wechatPayAmount",
+      payAmount: 0,
+      bgcolor: "#5AA25F",
+    },
+    {
+      payType: "支付宝小程序",
+      key: "aliPayAmount",
+      payAmount: 0,
+      bgcolor: "#31ACFE",
+    },
+    {
+      payType: "主扫收款",
+      key: "scanPayAmount",
+      payAmount: 0,
+      bgcolor: "#FF5C6D",
+    },
+    {
+      payType: "现金",
+      key: "cashPayAmount",
+      payAmount: 0,
+      bgcolor: "#FC843F",
+    },
+    {
+      payType: "充值",
+      key: "rechargeAmount",
+      payAmount: 0,
+      bgcolor: "#9090FF",
+    },
+    {
+      payType: "挂账",
+      key: "creditPayAmount",
+      payAmount: 0,
+      bgcolor: "#7BA7A4",
+    },
+    // {payType: '收款码收款', key:'', payAmount: 0,bgcolor:'#5AA25F'},
+  ],
+});
 
-	let selected = ref('today')
-	let showAll = ref(false);
-	let list = ref()
-	const pageData = reactive({
-		list: [{
-				payType: '微信小程序',
-				key: 'wechatPayAmount',
-				payAmount: 0,
-				bgcolor: '#5AA25F'
-			},
-			{
-				payType: '支付宝小程序',
-				key: 'aliPayAmount',
-				payAmount: 0,
-				bgcolor: '#31ACFE'
-			},
-			{
-				payType: '主扫收款',
-				key: 'scanPayAmount',
-				payAmount: 0,
-				bgcolor: '#FF5C6D'
-			},
-			{
-				payType: '现金',
-				key: 'cashPayAmount',
-				payAmount: 0,
-				bgcolor: '#FC843F'
-			},
-			{
-				payType: '充值',
-				key: 'rechargeAmount',
-				payAmount: 0,
-				bgcolor: '#9090FF'
-			},
-			{
-				payType: '挂账',
-				key: 'creditPayAmount',
-				payAmount: 0,
-				bgcolor: '#7BA7A4'
-			},
-			// {payType: '收款码收款', key:'', payAmount: 0,bgcolor:'#5AA25F'},
-		],
-	})
+function returnColorStyle(item) {
+  return {
+    backgroundColor: item.bgcolor,
+  };
+}
 
-	function returnColorStyle(item) {
-		return {
-			backgroundColor: item.bgcolor
-		}
-	}
+function toggleShowAll() {
+  showAll.value = !showAll.value;
+  setList();
+}
 
-	function toggleShowAll() {
-		showAll.value = !showAll.value
-		setList()
-	}
+function setList() {
+  // list.value = showAll.value ? pageData.list : pageData.list.slice(0, 4)
+  list.value = pageData.list;
+}
 
-	function setList() {
-		// list.value = showAll.value ? pageData.list : pageData.list.slice(0, 4)
-		list.value = pageData.list
-	}
+const emit = defineEmits(["totalRevenue"]);
 
+const timeSleIndex = ref(0);
 
-	const emit = defineEmits(['totalRevenue'])
-	const timeList = [{
-			label: '今天',
-			value: 'today'
-		},
-		{
-			label: '昨天',
-			value: 'yesterday'
-		},
-		{
-			label: '本周',
-			value: 'circumference'
-		}, {
-			label: '本月',
-			value: 'moon'
-		},
-		{
-			label: '自定义',
-			value: 'custom'
-		}
-	]
-	const datePicker = ref()
-	onShow((options) => {
-		let iToken = uni.getStorageSync('iToken').tokenValue
-		if (iToken) {
-			getlist()
-		} else {
-			uni.redirectTo({
-				url: '/pages/login/index'
-			})
-		}
-	});
+const datePicker = ref();
+onShow((options) => {
+  let iToken = uni.getStorageSync("iToken").tokenValue;
+  if (iToken) {
+    getlist();
+  } else {
+    uni.redirectTo({
+      url: "/pages/login/index",
+    });
+  }
+});
 
-	const yingyeE = ref(0)
-	const refundCount = ref(0)
-	/**
-	 * 获取统计数据
-	 * @param {Object} start
-	 * @param {Object} end
-	 */
-	function getlist(start, end) {
-		let startTime, endTime;
-		if (selected.value == 'today') {
-			startTime = dayjs().format('YYYY-MM-DD') + ' 00:00:00'
-			endTime = dayjs().format('YYYY-MM-DD') + ' 23:59:59'
-		} else if (selected.value == 'yesterday') {
-			startTime = formatTime() + ' 00:00:00'
-			endTime = formatTime() + ' 23:59:59'
-		} else if (selected.value == 'circumference') {
-			var now = new Date();
-			var nowTime = now.getTime();
-			var day = now.getDay();
-			var oneDayTime = 24 * 60 * 60 * 1000;
-			//显示周一
-			var MondayTime = nowTime - (day - 1) * oneDayTime;
-			//显示周日
-			var SundayTime = nowTime + (7 - day) * oneDayTime;
-			startTime = dayjs(MondayTime).format('YYYY-MM-DD 00:00:00')
-			endTime = dayjs(SundayTime).format('YYYY-MM-DD 23:59:59')
-		} else if (selected.value == 'moon') {
-			startTime = dayjs().startOf('month').format('YYYY-MM-DD') + ' 00:00:00'
-			endTime = dayjs().endOf('month').format('YYYY-MM-DD') + ' 23:59:59'
-		} else if (selected.value == 'custom') {
-			let s = start.substring(0, start.indexOf(' '))
-			let e = end.substring(0, end.indexOf(' '))
-			startTime = s + ' 00:00:00'
-			endTime = e + ' 23:59:59'
-		}
-		getTrade({
-			beginDate: startTime,
-			endDate: endTime,
-		}).then((res) => {
-			refundCount.value = res.refundCount
-			for (var key in res) {
-				pageData.list.map(item => {
-					if (item.key == key) {
-						item.payAmount = res[key]
-					}
-				})
-			}
-			setList()
-			let incomeAmountAll = 0;
-			pageData.list.map(item => {
-				incomeAmountAll += (item.payAmount || 0)
-			})
+const yingyeE = ref(0);
+const refundCount = ref(0);
+/**
+ * 获取统计数据
+ * @param {Object} start
+ * @param {Object} end
+ */
+function getlist(start, end) {
+  let beginDate, endDate;
+  const rangeType = timeList[timeSleIndex.value].value;
+  if(rangeType == "custom"){
+    beginDate = start.split(" ")[0];
+    endDate = end.split(" ")[0];
+  }else{
+	beginDate = timeList[timeSleIndex.value].beginDate;
+	endDate = timeList[timeSleIndex.value].endDate;
+  }
+  getTrade({
+    beginDate: beginDate,
+    endDate: endDate,
+    shopId: uni.getStorageSync("shopId"),
+    rangeType: rangeType,
+  }).then((res) => {
+    refundCount.value = res.refundCount;
+    for (var key in res) {
+      pageData.list.map((item) => {
+        if (item.key == key) {
+          item.payAmount = res[key];
+        }
+      });
+    }
+    setList();
+    let incomeAmountAll = 0;
+    pageData.list.map((item) => {
+      incomeAmountAll += item.payAmount || 0;
+    });
 
-			yingyeE.value = incomeAmountAll
-			emit('totalRevenue', incomeAmountAll)
-		})
-	}
+    yingyeE.value = incomeAmountAll;
+    emit("totalRevenue", incomeAmountAll);
+  });
+}
 
+/**
+ * 日期筛选确认
+ * @param {Object} e
+ */
+function datePickerConfirm(e) {
+  getlist(e.start, e.end);
+}
 
-	/**
-	 * 日期筛选确认
-	 * @param {Object} e
-	 */
-	function datePickerConfirm(e) {
-		getlist(e.start, e.end)
-	}
+// 获取当前时间
+function getdate() {
+  const dt = new Date();
+  const y = dt.getFullYear();
+  const m = (dt.getMonth() + 1 + "").padStart(2, "0");
+  const d = (dt.getDate() + "").padStart(2, "0");
+  const hh = (dt.getHours() + "").padStart(2, "0");
+  const mm = (dt.getMinutes() + "").padStart(2, "0");
+  const ss = (dt.getSeconds() + "").padStart(2, "0");
+  return `${y}-${m}-${d}`;
+}
 
-	// 获取当前时间
-	function getdate() {
-		const dt = new Date();
-		const y = dt.getFullYear();
-		const m = (dt.getMonth() + 1 + "").padStart(2, "0");
-		const d = (dt.getDate() + "").padStart(2, "0");
-		const hh = (dt.getHours() + "").padStart(2, "0");
-		const mm = (dt.getMinutes() + "").padStart(2, "0");
-		const ss = (dt.getSeconds() + "").padStart(2, "0");
-		return `${y}-${m}-${d}`;
-	}
+// 获取昨天时间
+const formatTime = () => {
+  let strDate = getdate();
+  let dateFormat = new Date(strDate);
+  dateFormat = dateFormat.setDate(dateFormat.getDate() - 1);
+  dateFormat = new Date(dateFormat);
+  let y = dateFormat.getFullYear();
+  let m = (dateFormat.getMonth() + 1).toString().padStart(2, "0");
+  let d = dateFormat.getDate().toString().padStart(2, "0");
+  return `${y}-${m}-${d}`;
+};
 
-	// 获取昨天时间
-	const formatTime = () => {
-		let strDate = getdate()
-		let dateFormat = new Date(strDate);
-		dateFormat = dateFormat.setDate(dateFormat.getDate() - 1);
-		dateFormat = new Date(dateFormat);
-		let y = dateFormat.getFullYear()
-		let m = (dateFormat.getMonth() + 1).toString().padStart(2, '0')
-		let d = dateFormat.getDate().toString().padStart(2, '0')
-		return `${y}-${m}-${d}`
-	}
+function changeTime(e, index) {
+  selected.value = e;
+  timeSleIndex.value = index;
+  if (e == "custom") {
+    datePicker.value.toggle();
+  } else {
+    getlist();
+  }
+}
 
-	const timeSleIndex = ref(0)
-
-	function changeTime(e, index) {
-		selected.value = e
-		timeSleIndex.value = index
-		if (e == 'custom') {
-			datePicker.value.toggle()
-		} else {
-			getlist()
-		}
-	}
-	
-	const xArr=[0,134,262,390,532]
-	const comBlockX = computed(() => {
-		return xArr[ timeSleIndex.value]
-	})
+const xArr = [0, 134, 262, 390, 532];
+const comBlockX = computed(() => {
+  return xArr[timeSleIndex.value];
+});
 </script>
 <style scoped lang="less">
-	ul,
-	li {
-		list-style: none;
-		padding: 0;
-	}
+ul,
+li {
+  list-style: none;
+  padding: 0;
+}
 
-	.rotate {
-		transform: rotate(180deg);
-	}
+.rotate {
+  transform: rotate(180deg);
+}
 
-	.statistics {
-		padding: 0 28rpx;
-		margin-top: 50rpx;
-		position: relative;
+.statistics {
+  padding: 0 28rpx;
+  margin-top: 50rpx;
+  position: relative;
 
-		.title {
-			position: absolute;
-			width: 170rpx;
-			left: 18rpx;
-			height: 50rpx;
-			line-height: 50rpx;
-			font-weight: 700;
-			font-size: 26rpx;
-			color: #fff;
-			text-align: center;
-			background: linear-gradient(109deg, #70B9FF 0%, #629FFA 100%);
-			border-radius: 12rpx 12rpx 12rpx 0rpx;
-			top: -16px;
-		}
+  .title {
+    position: absolute;
+    width: 170rpx;
+    left: 18rpx;
+    height: 50rpx;
+    line-height: 50rpx;
+    font-weight: 700;
+    font-size: 26rpx;
+    color: #fff;
+    text-align: center;
+    background: linear-gradient(109deg, #70b9ff 0%, #629ffa 100%);
+    border-radius: 12rpx 12rpx 12rpx 0rpx;
+    top: -16px;
+  }
 
-		.statisticsBox {
-			width: 694rpx;
-			background: #FFFFFF;
-			border-radius: 16rpx 16rpx 16rpx 16rpx;
-			padding: 48rpx 32rpx 32rpx;
-			box-sizing: border-box;
-			margin-top: 54rpx;
+  .statisticsBox {
+    width: 694rpx;
+    background: #ffffff;
+    border-radius: 16rpx 16rpx 16rpx 16rpx;
+    padding: 48rpx 32rpx 32rpx;
+    box-sizing: border-box;
+    margin-top: 54rpx;
 
-			.bottom {}
+    .bottom {
+    }
 
-			.time-wrapper {
-				display: flex;
-				justify-content: space-between;
+    .time-wrapper {
+      display: flex;
+      justify-content: space-between;
 
-				.timelistbox {
-					position: relative;
-					display: flex;
-					flex-direction: column;
-					align-items: center;
+      .timelistbox {
+        position: relative;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
 
-					.time-item {
-						font-size: 28rpx;
-						text-align: center;
-						padding-bottom: 10rpx;
-					}
+        .time-item {
+          font-size: 28rpx;
+          text-align: center;
+          padding-bottom: 10rpx;
+        }
 
-					.xian {
-						width: 40rpx;
-						height: 3rpx;
-						background-color: #318AFE;
-						// position: absolute;
-						// left: 16rpx;
-						// bottom: 0;
-					}
-				}
+        .xian {
+          width: 40rpx;
+          height: 3rpx;
+          background-color: #318afe;
+          // position: absolute;
+          // left: 16rpx;
+          // bottom: 0;
+        }
+      }
 
-				.time-selected {
-					color: #318afe;
-					font-size: 32rpx !important;
-					font-weight: bold;
-				}
-			}
+      .time-selected {
+        color: #318afe;
+        font-size: 32rpx !important;
+        font-weight: bold;
+      }
+    }
 
-			.line {
-				width: 0rpx;
-				height: 170rpx;
-				border: 2rpx solid #EEE8E8;
-			}
+    .line {
+      width: 0rpx;
+      height: 170rpx;
+      border: 2rpx solid #eee8e8;
+    }
 
-			.payList {
-				display: flex;
-				flex-direction: column;
-				align-items: center;
-				flex-wrap: wrap;
+    .payList {
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      flex-wrap: wrap;
 
-				.li {
-					display: flex;
-					justify-content: space-between;
-					align-items: center;
-					white-space: nowrap;
-					margin-top: 12rpx;
+      .li {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        white-space: nowrap;
+        margin-top: 12rpx;
 
-					>view {
-						text-align: center;
-					}
-				}
-			}
-		}
-	}
+        > view {
+          text-align: center;
+        }
+      }
+    }
+  }
+}
 
-	.circle {
-		width: 8rpx;
-		height: 8rpx;
-		border-radius: 8rpx;
-	}
+.circle {
+  width: 8rpx;
+  height: 8rpx;
+  border-radius: 8rpx;
+}
 
-	.time_bootom_line {
-		height: 16rpx;
-		position: relative;
-		border-bottom: 1px solid #629FFA;
+.time_bootom_line {
+  height: 16rpx;
+  position: relative;
+  border-bottom: 1px solid #629ffa;
 
-		.block {
-			width: 18rpx;
-			height: 18rpx;
-			box-sizing: border-box;
-			background: #fff;
-			position: absolute;
-			border-top: 0.5rpx solid #629FFA;
-			border-left: 0.5rpx solid #629FFA;
-			left: 30rpx;
-			top: 6rpx;
-			transform: rotate(45deg);
-			transform-origin: center;
-			transition: all .2s linear;
-		}
-	}
-</style>
\ No newline at end of file
+  .block {
+    width: 18rpx;
+    height: 18rpx;
+    box-sizing: border-box;
+    background: #fff;
+    position: absolute;
+    border-top: 0.5rpx solid #629ffa;
+    border-left: 0.5rpx solid #629ffa;
+    left: 30rpx;
+    top: 6rpx;
+    transform: rotate(45deg);
+    transform-origin: center;
+    transition: all 0.2s linear;
+  }
+}
+</style>
diff --git a/pages/login/index.vue b/pages/login/index.vue
index 90e55f9..296ac27 100644
--- a/pages/login/index.vue
+++ b/pages/login/index.vue
@@ -273,9 +273,11 @@
 	 */
 	async function loginFinishFunc(loginBizData) {
 		// 保存 token
+		console.log('loginBizData',loginBizData)
 		storageManage.setLogin(loginBizData)
 		storageManage.token(loginBizData.tokenInfo)
 		uni.setStorageSync("promission",loginBizData.promissionList)
+		uni.setStorageSync("shopId",loginBizData.shopInfo.id)
 		
 		// var time1 = new Date();
 		// var time2 = new Date(loginBizData.expireDate);

From 0d13ae2e9e52bb2b1a918c9d8fad1350e95162c6 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Mon, 24 Nov 2025 17:16:44 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9=EF=BC=8C=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E9=94=80=E5=94=AE=E7=BB=9F=E8=AE=A1=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../JeepayNavigation/JeepayNavigation.vue     |   2 +-
 http/api/order/summary.js                     |  10 +
 pageSalesSummary/index.vue                    |  26 +-
 pageSalesSummary/sales.vue                    | 411 ++++++++++++++++++
 pages.json                                    |  14 +-
 pages/index/components/statistics.vue         |   6 +-
 6 files changed, 459 insertions(+), 10 deletions(-)
 create mode 100644 pageSalesSummary/sales.vue

diff --git a/components/JeepayNavigation/JeepayNavigation.vue b/components/JeepayNavigation/JeepayNavigation.vue
index f49fc48..53795bd 100644
--- a/components/JeepayNavigation/JeepayNavigation.vue
+++ b/components/JeepayNavigation/JeepayNavigation.vue
@@ -78,7 +78,7 @@
 
 	// 点击事件
 	async function clickFunc(nav) {
-		if (nav.pageUrl == "PAGES_SALES_SUMMARY") {
+		if (nav.pageUrl == "PAGES_DATA_SUMMARY") {
 			let res = await hasPermission('允许查看经营数据')
 			if (!res) return
 		}
diff --git a/http/api/order/summary.js b/http/api/order/summary.js
index 285125a..c56a727 100644
--- a/http/api/order/summary.js
+++ b/http/api/order/summary.js
@@ -20,4 +20,14 @@ export function saleSummaryPage(data) {
         ...data,
       },
     });
+  }
+
+  export function saleSummaryCount(data) {
+    return request({
+      url: `${urlType}/admin/sale/summary/count`,
+      method: "GET",
+      data: {
+        ...data,
+      },
+    });
   }
\ No newline at end of file
diff --git a/pageSalesSummary/index.vue b/pageSalesSummary/index.vue
index 98c9620..f5fbb6e 100644
--- a/pageSalesSummary/index.vue
+++ b/pageSalesSummary/index.vue
@@ -15,7 +15,7 @@
   <view class="pageSalesSummaryContent">
     <view class="">
       <view class=""> 实收金额(元) </view>
-      <view class=""> {{ list.saleAmount ? list.saleAmount : 0 }} </view>
+      <view class=""> {{ list.payAmount ? list.payAmount : 0 }} </view>
     </view>
     <view class="">
       <view class=""> 优惠金额(元) </view>
@@ -26,7 +26,7 @@
     <view class="">
       <view class=""> 客单价(元) </view>
       <view class="">
-        {{ list.customerUnitPrice ? list.customerUnitPrice : 0 }}
+        {{ list.avgPayAmount ? list.avgPayAmount : 0 }}
       </view>
     </view>
     <view class="">
@@ -44,7 +44,7 @@
     <view class="">
       <view class=""> 翻台率(%) </view>
       <view class="">
-        {{ list.tableTurnoverRate ? list.tableTurnoverRate : 0 }}
+        {{ list.turnoverRate ? list.turnoverRate : 0 }}
       </view>
     </view>
   </view>
@@ -97,6 +97,8 @@
     更多 <uni-icons type="right" size="16"></uni-icons>
   </view>
   <datePickerview
+  @close="datePickerClose"
+
     @confirm="datePickerConfirm"
     ref="datePicker"
   ></datePickerview>
@@ -111,9 +113,23 @@ import { getTrade } from "@/http/api/summary.js";
 import { saleSummaryPage } from "@/http/api/order/summary.js";
 import { timeList } from "@/data/index.js";
 
+function resetDatePicker() {
+  datePickerData.value.beginDate = "";
+  datePickerData.value.endDate = "";
+}
+
+function datePickerClose() {
+  console.log("datePickerClose");
+  if (!datePickerData.value.beginDate && !datePickerData.value.endDate) {
+    selected.value = oldSelected;
+  }
+}
+
 const datePicker = ref();
 
 let selected = ref("today");
+let oldSelected = selected.value;
+
 let list = ref({});
 let tableList = ref([]);
 let day = ref(1);
@@ -157,9 +173,13 @@ function gettableData(beginDate, endDate) {
  */
 function changeTime(e) {
   selected.value = e;
+  resetDatePicker();
+
   if (e == "custom") {
     datePicker.value.toggle();
   } else {
+    oldSelected = e;
+
     getData();
   }
 }
diff --git a/pageSalesSummary/sales.vue b/pageSalesSummary/sales.vue
new file mode 100644
index 0000000..22c4305
--- /dev/null
+++ b/pageSalesSummary/sales.vue
@@ -0,0 +1,411 @@
+<template>
+  <view class="time-wrapper">
+    <view v-for="(v, i) in timeList" :key="i" class="timelistbox">
+      <view
+        class="time-item"
+        @tap="changeTime(v.value)"
+        :class="[v.value == selected ? 'time-selected' : '']"
+      >
+        {{ v.label }}
+      </view>
+      <view class="xian" v-if="v.value == selected"> </view>
+    </view>
+  </view>
+
+  <view class="pageSalesSummaryContent">
+    <view class="">
+      <view class="">总金额(元) </view>
+      <view class=""> {{ list.totalAmount ? list.totalAmount : 0 }} </view>
+    </view>
+    <view class="">
+      <view class=""> 退款金额(元) </view>
+      <view class="">
+        {{ list.refundAmount ? list.refundAmount : 0 }}
+      </view>
+    </view>
+    <view class="">
+      <view class=""> 总数量 </view>
+      <view class="">
+        {{ list.saleCount ? list.saleCount : 0 }}
+      </view>
+    </view>
+    <view class="">
+      <view class=""> 退单量 </view>
+      <view class="">
+        {{ list.refundCount ? list.refundCount : 0 }}
+      </view>
+    </view>
+  </view>
+  <view class="table-scroll">
+    <view class="color-333 u-font-28 bg-gray default-box-padding">
+      <scroll-view :scroll-x="true" class="bg-fff table u-text-center">
+        <view class="bg-fff border-r-12 u-flex no-wrap u-col-top">
+          <view class="constantbox">
+            <view class="constantboxitem">
+              <view class="head">商品名称</view>
+              <view class="head">总数量</view>
+              <view class="head">金额</view>
+            </view>
+            <view
+              class="constantboxitem"
+              v-for="(item, index) in tableList"
+              :key="index"
+              @click="toDetail(item)"
+            >
+              <view class="head" style="padding-left: 16rpx">
+                <image
+                  v-if="index == 0"
+                  src="../pageTable/index/images/1.png"
+                  style="width: 22rpx; height: 30rpx"
+                  mode=""
+                ></image>
+                <image
+                  v-else-if="index == 1"
+                  src="../pageTable/index/images/2.png"
+                  style="width: 22rpx; height: 30rpx"
+                  mode=""
+                ></image>
+                <image
+                  v-else-if="index == 2"
+                  src="../pageTable/index/images/3.png"
+                  style="width: 22rpx; height: 30rpx"
+                  mode=""
+                ></image>
+                &nbsp;&nbsp;{{ item.productName }}
+              </view>
+              <view class="head">{{ item.saleCount || 0 }}</view>
+              <view class="head">{{ item.saleAmount || 0 }}</view>
+            </view>
+          </view>
+        </view>
+      </scroll-view>
+    </view>
+  </view>
+  <view class="bottombtn" @tap="toUrl">
+    更多 <uni-icons type="right" size="16"></uni-icons>
+  </view>
+  <datePickerview
+    @close="datePickerClose"
+    @confirm="datePickerConfirm"
+    ref="datePicker"
+  ></datePickerview>
+</template>
+
+<script setup>
+import { onMounted, ref } from "vue";
+import datePickerview from "./components/my-date-pickerview.vue";
+import dayjs from "dayjs"; //时间格式库
+import go from "@/commons/utils/go.js";
+import { saleSummaryPage, saleSummaryCount } from "@/http/api/order/summary.js";
+import { timeList } from "@/data/index.js";
+
+function datePickerClose() {
+  console.log("datePickerClose");
+  if (!datePickerData.value.beginDate && !datePickerData.value.endDate) {
+    selected.value = oldSelected;
+  }
+}
+
+const datePicker = ref();
+
+let selected = ref("today");
+let oldSelected = selected.value;
+
+let list = ref({});
+let tableList = ref([]);
+let day = ref(1);
+onMounted(() => {
+  getData();
+});
+
+/**
+ * 获取营业数据
+ * @param {Object} beginDate
+ * @param {Object} endDate
+ */
+function getlist(beginDate, endDate) {
+  saleSummaryCount({
+    beginDate,
+    endDate,
+    rangeType: selected.value,
+  }).then((res) => {
+    list.value = res || {
+      refundAmount: 0,
+      refundCount: 0,
+      saleCount: 0,
+      totalAmount: 0,
+    };
+  });
+}
+
+/**
+ * 获取销售数据
+ * @param {Object} beginDate
+ * @param {Object} endDate
+ */
+function gettableData(beginDate, endDate) {
+  saleSummaryPage({
+    beginDate,
+    endDate,
+    rangeType: selected.value,
+  }).then((res) => {
+    tableList.value = (res || []).slice(0, 5);
+  });
+}
+
+function resetDatePicker() {
+  datePickerData.value.beginDate = "";
+  datePickerData.value.endDate = "";
+}
+/**
+ * 时间切换
+ * @param {Object} e
+ */
+function changeTime(e) {
+  selected.value = e;
+  resetDatePicker();
+  if (e == "custom") {
+    datePicker.value.toggle();
+  } else {
+    oldSelected = e;
+
+    getData();
+  }
+}
+
+const datePickerData = ref({
+  beginDate: "",
+  endDate: "",
+});
+/**
+ * 自定义确认
+ * @param {Object} e
+ */
+function datePickerConfirm(e) {
+  datePickerData.value.beginDate = e.start;
+  datePickerData.value.endDate = e.end;
+  getData(e.start, e.end);
+}
+function getData(start, end) {
+  let beginDate, endDate;
+  if (selected.value == "custom") {
+    beginDate = start.substring(0, start.indexOf(" "));
+    endDate = end.substring(0, end.indexOf(" "));
+  } else {
+    beginDate = timeList.find((item) => item.value == selected.value).beginDate;
+    endDate = timeList.find((item) => item.value == selected.value).endDate;
+  }
+  getlist(beginDate, endDate);
+  gettableData(beginDate, endDate);
+}
+/**
+ * 更多
+ */
+function toUrl() {
+  let beginDate, endDate;
+  if (selected.value == "custom") {
+    beginDate = datePickerData.value.beginDate.substring(
+      0,
+      datePickerData.value.beginDate.indexOf(" ")
+    );
+    endDate = datePickerData.value.endDate.substring(
+      0,
+      datePickerData.value.endDate.indexOf(" ")
+    );
+  } else {
+    beginDate = timeList.find((item) => item.value == selected.value).beginDate;
+    endDate = timeList.find((item) => item.value == selected.value).endDate;
+  }
+  go.to("PAGES_PRODUCT_SALES_RANKING", {
+    beginDate,
+    endDate,
+    rangeType: selected.value,
+  });
+}
+</script>
+<style>
+page {
+  background: #f6f6f6;
+}
+</style>
+<style lang="scss" scoped>
+.fixed-top {
+  padding: 32rpx 28rpx;
+  z-index: 100;
+}
+
+.bottom {
+  background-color: transparent;
+  bottom: 84rpx;
+  left: 28rpx;
+  right: 28rpx;
+}
+
+.table {
+  border-radius: 12rpx 12rpx 0rpx 0rpx;
+  overflow: hidden;
+  font-size: 24rpx;
+
+  .constantbox {
+    .constantboxitem {
+      display: flex;
+
+      .head {
+        width: 220rpx;
+        padding: 32rpx 24rpx;
+        font-family: Source Han Sans CN, Source Han Sans CN;
+        font-weight: 400;
+        font-size: 24rpx;
+        color: #333333;
+        overflow: hidden; //超出的文本隐藏
+        text-overflow: ellipsis; //溢出用省略号显示
+        white-space: nowrap; //溢出不换行
+      }
+
+      .head:nth-child(4) {
+        width: 300rpx;
+      }
+
+      .head:nth-child(5) {
+        width: 300rpx;
+      }
+    }
+
+    .constantboxitem:nth-child(even) {
+      background: #fff;
+    }
+
+    .constantboxitem:nth-child(odd) {
+      background: #f7f6fb;
+    }
+
+    .constantboxitem:nth-child(1) {
+      background: #aebad2;
+      color: #fff;
+      font-size: 24rpx;
+    }
+  }
+
+  .item:nth-of-type(2n + 1) {
+    background-color: rgb(249, 249, 249);
+  }
+}
+</style>
+
+<style scoped lang="less">
+.time-wrapper {
+  display: flex;
+  justify-content: space-around;
+  padding-bottom: 16rpx;
+  padding-top: 16rpx;
+  background-color: #fff;
+
+  .timelistbox {
+    position: relative;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+
+    .time-item {
+      font-size: 28rpx;
+      text-align: center;
+      padding-bottom: 10rpx;
+    }
+
+    .xian {
+      width: 40rpx;
+      height: 3rpx;
+      background-color: #318afe;
+      // position: absolute;
+      // left: 16rpx;
+      // bottom: 0;
+    }
+  }
+
+  .time-selected {
+    color: #318afe;
+    font-size: 32rpx !important;
+  }
+}
+
+.pageSalesSummaryContent {
+  height: 320rpx;
+  margin: 20rpx 28rpx;
+  background-image: url("./svg/bgimg.svg");
+  background-size: 694rpx 320rpx;
+  padding: 48rpx 28rpx;
+  .df;
+  justify-content: space-between;
+  flex-wrap: wrap;
+
+  > view {
+    width: 50%;
+    padding-right: 52rpx;
+    color: #fff;
+    font-family: Source Han Sans CN, Source Han Sans CN;
+    font-weight: 400;
+    font-size: 28rpx;
+  }
+}
+
+// 表格
+.table-scroll {
+  // width: calc(100% - 5px);
+  overflow-x: scroll;
+  white-space: nowrap;
+  margin: 32rpx 28rpx;
+  margin-right: 30rpx;
+  border-radius: 30rpx 30rpx 0 0;
+}
+
+.table-scroll .table {
+  table-layout: fixed;
+  // width: calc(100% - 10rpx);
+}
+
+.table-scroll .thead {
+  display: table-row;
+  background-color: bisque;
+  font-size: 24rpx;
+}
+
+.table-scroll .tbody {
+  overflow-y: scroll;
+  overflow-x: hidden;
+  display: block;
+  // width: 1040rpx;
+  width: 100%;
+  // width: calc(100% );
+}
+
+// .table-scroll th,
+// td {
+// 	height: 82rpx;
+// 	overflow: hidden;
+// 	text-overflow: ellipsis;
+// 	width: 250rpx;
+// 	// border: 0.7rpx solid red;
+// 	border: 0.7rpx solid rgba(126, 155, 212, 0.27);
+// }
+
+.bottombtn {
+  width: 694rpx;
+  height: 56rpx;
+  line-height: 56rpx;
+  text-align: center;
+  margin: 0rpx auto;
+  background: #f1f1f1;
+  font-size: 24rpx;
+  border-radius: 0rpx 0rpx 28rpx 28rpx;
+}
+
+.df() {
+  display: flex;
+  align-items: center;
+}
+</style>
+<style>
+.min-page {
+  height: 20vh;
+}
+</style>
diff --git a/pages.json b/pages.json
index e0e95d8..17b838e 100644
--- a/pages.json
+++ b/pages.json
@@ -390,12 +390,20 @@
 		{
 			"root": "pageSalesSummary",
 			"pages": [{
-				"pageId": "PAGES_SALES_SUMMARY",
+				"pageId": "PAGES_DATA_SUMMARY",
 				"path": "index",
 				"style": {
-					"navigationBarTitleText": "销售汇总"
+					"navigationBarTitleText": "数据统计"
 				}
-			}, {
+			},
+			{
+				"pageId": "PAGES_SALES_SUMMARY",
+				"path": "sales",
+				"style": {
+					"navigationBarTitleText": "销量统计"
+				}
+			},
+			{
 				"pageId": "PAGES_PRODUCT_SALES_RANKING",
 				"path": "productSalesRanking",
 				"style": {
diff --git a/pages/index/components/statistics.vue b/pages/index/components/statistics.vue
index 4c08745..026e7d1 100644
--- a/pages/index/components/statistics.vue
+++ b/pages/index/components/statistics.vue
@@ -47,7 +47,7 @@
                 size="14"
                 bold
                 mode="price"
-                :text="refundCount"
+                :text="refundAmount"
               ></up-text>
             </view>
           </view>
@@ -180,7 +180,7 @@ onShow((options) => {
 });
 
 const yingyeE = ref(0);
-const refundCount = ref(0);
+const refundAmount = ref(0);
 /**
  * 获取统计数据
  * @param {Object} start
@@ -202,7 +202,7 @@ function getlist(start, end) {
     shopId: uni.getStorageSync("shopId"),
     rangeType: rangeType,
   }).then((res) => {
-    refundCount.value = res.refundCount;
+    refundAmount.value = res.refundAmount;
     for (var key in res) {
       pageData.list.map((item) => {
         if (item.key == key) {

From 4faa4823801978103abcf00455d0dee6ebbb9651 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Tue, 25 Nov 2025 09:57:02 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=94=B5=E5=AD=90?=
 =?UTF-8?q?=E5=9B=B4=E6=A0=8F=E5=BC=80=E5=85=B3=EF=BC=8C=E5=BA=97=E9=93=BA?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=A2=9E=E5=8A=A0=E4=BF=AE=E6=94=B9=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E5=BC=B9=E7=AA=97=E6=8F=90=E9=86=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/components/statistics.vue |    2 +-
 pages/shopSetUp/index.vue             | 1034 ++++++++++++++-----------
 2 files changed, 566 insertions(+), 470 deletions(-)

diff --git a/pages/index/components/statistics.vue b/pages/index/components/statistics.vue
index 026e7d1..737594b 100644
--- a/pages/index/components/statistics.vue
+++ b/pages/index/components/statistics.vue
@@ -121,7 +121,7 @@ const pageData = reactive({
     },
     {
       payType: "主扫收款",
-      key: "scanPayAmount",
+      key: "backScanPayAmount",
       payAmount: 0,
       bgcolor: "#FF5C6D",
     },
diff --git a/pages/shopSetUp/index.vue b/pages/shopSetUp/index.vue
index 6e405bd..60ea6ab 100644
--- a/pages/shopSetUp/index.vue
+++ b/pages/shopSetUp/index.vue
@@ -1,66 +1,119 @@
 <template>
-	<view class="page-wrapper">
-		<view class="page-cell">
-			<view class="label">头像</view>
-			<view class="right">
-				<up-avatar class="fileImg" :src="vdata.shopInfo.coverImg ? vdata.shopInfo.coverImg : ''" mode="aspectFill"></up-avatar>
-				<view class="file" @tap="chooseAndUploadAvatar('coverImg')"></view>
-			</view>
-		</view>
-		<!-- <view class="page-cell m" @tap="updateValue('商户名称','shopName',vdata.shopInfo.shopName)"> -->
-		<view class="page-cell m" @tap="go.to('PAGES_SHOP_EDITVAL', { name: 'shopName', value: vdata.shopInfo.shopName })">
-			<view class="label">商户名称</view>
-			<view class="right">
-				<view>{{ vdata.shopInfo.shopName }}</view>
-				<up-icon name="arrow-right" color="#999999" size="15"></up-icon>
-			</view>
-		</view>
-		<view class="page-cell m" @tap="go.to('PAGES_SHOP_EDITVAL', { name: 'phone', value: vdata.shopInfo.phone })">
-			<view class="label">商户电话</view>
-			<view class="right">
-				<view>{{ vdata.shopInfo.phone }}</view>
-				<up-icon name="arrow-right" color="#999999" size="15"></up-icon>
-			</view>
-		</view>
-		<!-- 	<view class="page-cell m" >
+  <view class="page-wrapper">
+    <view class="page-cell">
+      <view class="label">头像</view>
+      <view class="right">
+        <up-avatar
+          class="fileImg"
+          :src="vdata.shopInfo.coverImg ? vdata.shopInfo.coverImg : ''"
+          mode="aspectFill"
+        ></up-avatar>
+        <view class="file" @tap="chooseAndUploadAvatar('coverImg')"></view>
+      </view>
+    </view>
+    <!-- <view class="page-cell m" @tap="updateValue('商户名称','shopName',vdata.shopInfo.shopName)"> -->
+    <view
+      class="page-cell m"
+      @tap="
+        go.to('PAGES_SHOP_EDITVAL', {
+          name: 'shopName',
+          value: vdata.shopInfo.shopName,
+        })
+      "
+    >
+      <view class="label">商户名称</view>
+      <view class="right">
+        <view>{{ vdata.shopInfo.shopName }}</view>
+        <up-icon name="arrow-right" color="#999999" size="15"></up-icon>
+      </view>
+    </view>
+    <view
+      class="page-cell m"
+      @tap="
+        go.to('PAGES_SHOP_EDITVAL', {
+          name: 'phone',
+          value: vdata.shopInfo.phone,
+        })
+      "
+    >
+      <view class="label">商户电话</view>
+      <view class="right">
+        <view>{{ vdata.shopInfo.phone }}</view>
+        <up-icon name="arrow-right" color="#999999" size="15"></up-icon>
+      </view>
+    </view>
+    <!-- 	<view class="page-cell m" >
 		<view class="label">到期时间</view>
 		<view class="right"><view>{{ vdata.shopInfo.realname }}</view><up-icon name="arrow-right" color="#999999" size="15"></up-icon></view>
 	</view> -->
-		<view class="page-cell m">
-			<view class="label">营业状态</view>
-			<view class="right">
-				<up-switch v-model="vdata.shopInfo.status" size="20" :inactiveValue="2" :activeValue="1" activeColor="#0FC161" @change="switchChange('status')"></up-switch>
-			</view>
-		</view>
-		<view class="page-cell m" @tap="showMap">
-			<view class="label">门店详细地址</view>
-			<view class="right">
-				<view>{{ vdata.shopInfo.address }}</view>
-				<up-icon name="arrow-right" color="#999999" size="15"></up-icon>
-			</view>
-		</view>
-		<!-- <view class="page-cell">
+    <view class="page-cell m">
+      <view class="label">营业状态</view>
+      <view class="right">
+        <up-switch
+          v-model="vdata.shopInfo.status"
+          size="20"
+          :inactiveValue="2"
+          :activeValue="1"
+          activeColor="#0FC161"
+          @change="switchChange('status')"
+        ></up-switch>
+      </view>
+    </view>
+    <view class="page-cell m" @tap="showMap">
+      <view class="label">门店详细地址</view>
+      <view class="right">
+        <view>{{ vdata.shopInfo.address }}</view>
+        <up-icon name="arrow-right" color="#999999" size="15"></up-icon>
+      </view>
+    </view>
+    <!-- <view class="page-cell">
 		<view class="label">堂食功能</view>
 		<view class="right"><up-switch v-model="vdata.dineIn" size="20" activeColor="#0FC161" @change="switchChange('eatModel')"></up-switch></view>	
 	</view> -->
-		<view class="page-cell">
-			<view class="label">允许打包</view>
-			<view class="right"><up-switch v-model="vdata.takeout" size="20" activeColor="#0FC161" @change="switchChange('eatModel')"></up-switch></view>
-		</view>
-		<view class="page-cell m">
-			<view class="label">是否开启会员余额支付</view>
-			<view class="right">
-				<up-switch
-					v-model="vdata.shopInfo.isAccountPay"
-					size="20"
-					:inactiveValue="0"
-					:activeValue="1"
-					activeColor="#0FC161"
-					@change="switchChange('isAccountPay')"
-				></up-switch>
-			</view>
-		</view>
-		<view class="page-cell m">
+    <view class="page-cell">
+      <view class="label">允许打包</view>
+      <view class="right"
+        ><up-switch
+          v-model="vdata.takeout"
+          size="20"
+          activeColor="#0FC161"
+          @change="switchChange('eatModel')"
+        ></up-switch
+      ></view>
+    </view>
+    <view class="page-cell m">
+      <view class="label">是否开启会员余额支付</view>
+      <view class="right">
+        <up-switch
+          v-model="vdata.shopInfo.isAccountPay"
+          size="20"
+          :inactiveValue="0"
+          :activeValue="1"
+          activeColor="#0FC161"
+          @change="switchChange('isAccountPay')"
+        ></up-switch>
+      </view>
+    </view>
+    <view class="page-cell m" style="display: block">
+      <view class="u-flex u-row-between">
+        <view class="label">点餐电子围栏</view>
+        <view class="right"
+          ><up-switch
+            v-model="vdata.shopInfo.isOrderFence"
+            size="20"
+            :inactiveValue="0"
+            :activeValue="1"
+            activeColor="#0FC161"
+            @change="switchChange('isOrderFence')"
+          ></up-switch
+        ></view>
+      </view>
+      <view class="u-m-t-6 color-666 u-font-24"
+        >开启后，用户只能在店铺附近两公里范围内点餐</view
+      >
+    </view>
+
+    <!-- <view class="page-cell m">
 			<view class="label">是否开启会员价支付</view>
 			<view class="right">
 				<up-switch
@@ -72,23 +125,38 @@
 					@change="switchChange('isMemberPrice')"
 				></up-switch>
 			</view>
-		</view>
-		<view class="page-cell">
-			<view class="label">
-				桌位费
-				<view v-if="!vdata.isTableFee" class="tableFee" @tap="go.to('PAGES_SHOP_EDITVAL', { name: 'tableFee', value: vdata.shopInfo.tableFee })">
-					{{ vdata.shopInfo.tableFee }}
-				</view>
-			</view>
-			<view class="right">
-				<view>
-					<up-checkbox-group>
-						<up-checkbox label="免桌位费" v-model:checked="vdata.isTableFee" activeColor="#0FC161" shape="circle" @change="isTableFeeChange"></up-checkbox>
-					</up-checkbox-group>
-				</view>
-			</view>
-		</view>
-		<!-- <view class="page-cell">
+		</view> -->
+    <view class="page-cell">
+      <view class="label">
+        桌位费
+        <view
+          v-if="!vdata.isTableFee"
+          class="tableFee"
+          @tap="
+            go.to('PAGES_SHOP_EDITVAL', {
+              name: 'tableFee',
+              value: vdata.shopInfo.tableFee,
+            })
+          "
+        >
+          {{ vdata.shopInfo.tableFee }}
+        </view>
+      </view>
+      <view class="right">
+        <view>
+          <up-checkbox-group>
+            <up-checkbox
+              label="免桌位费"
+              v-model:checked="vdata.isTableFee"
+              activeColor="#0FC161"
+              shape="circle"
+              @change="isTableFeeChange"
+            ></up-checkbox>
+          </up-checkbox-group>
+        </view>
+      </view>
+    </view>
+    <!-- <view class="page-cell">
 			<view class="label">台桌清理类型</view>
 			<view class="right">
 				<up-radio-group v-model="vdata.shopInfo.tableClearType" placement="row" @change="tableClearChange">
@@ -105,495 +173,523 @@
 				
 			</view>
 		</view> -->
-		<view class="page-cell m">
-			<view class="label">付费模式</view>
-			<view class="right">
-				<up-radio-group v-model="vdata.shopInfo.registerType" placement="row">
-					<up-radio
-						:customStyle="{ marginRight: '10px' }"
-						v-for="(item, index) in vdata.registerTypeList"
-						:key="index"
-						:label="item.name"
-						:name="item.value"
-						activeColor="#0FC161"
-						@change="radioChange"
-					></up-radio>
-				</up-radio-group>
-			</view>
-		</view>
-		<view class="page-cell" @tap="go.to('PAGES_SHOP_QRCODE', { paymentQrcode: vdata.shopInfo.paymentQrcode })">
-			<view class="label">店铺收款码</view>
-			<view class="right"><up-icon name="arrow-right" color="#999999" size="15"></up-icon></view>
-		</view>
-	
-		<!-- <view class="cutShop" @tap="go.to('PAGES_SHOP_LIST')">切换门店</view> -->
-	</view>
+    <view class="page-cell m">
+      <view class="label">付费模式</view>
+      <view class="right">
+        <up-radio-group v-model="vdata.shopInfo.registerType" placement="row">
+          <up-radio
+            :customStyle="{ marginRight: '10px' }"
+            v-for="(item, index) in vdata.registerTypeList"
+            :key="index"
+            :label="item.name"
+            :name="item.value"
+            activeColor="#0FC161"
+            @change="radioChange"
+          ></up-radio>
+        </up-radio-group>
+      </view>
+    </view>
+    <view
+      class="page-cell"
+      @tap="
+        go.to('PAGES_SHOP_QRCODE', {
+          paymentQrcode: vdata.shopInfo.paymentQrcode,
+        })
+      "
+    >
+      <view class="label">店铺收款码</view>
+      <view class="right"
+        ><up-icon name="arrow-right" color="#999999" size="15"></up-icon
+      ></view>
+    </view>
+
+    <!-- <view class="cutShop" @tap="go.to('PAGES_SHOP_LIST')">切换门店</view> -->
+  </view>
 </template>
 
 <script setup>
-import { ref, reactive, onMounted } from 'vue';
-import { onShow } from '@dcloudio/uni-app';
-import go from '@/commons/utils/go.js';
-import { uploadFile } from '@/http/api/index.js';
-import { getShopInfo, editShopInfo, getShopExtend, editShopExtend } from '@/http/api/shop.js';
+import { ref, reactive, onMounted } from "vue";
+import { onShow } from "@dcloudio/uni-app";
+import go from "@/commons/utils/go.js";
+import { uploadFile } from "@/http/api/index.js";
+import {
+  getShopInfo,
+  editShopInfo,
+  getShopExtend,
+  editShopExtend,
+} from "@/http/api/shop.js";
 
 const vdata = reactive({
-	shopInfo: {
-		status: 2,
-		isAccountPay: 0,
-		isMemberPrice: 0
-	},
-	extendList: [],
-	registerTypeList: [
-		{ name: '先付费', value: 'before' },
-		{ name: '后付费', value: 'after' }
-	],
-	extendIndex: 0,
-	extendInfo: {},
-	dineIn: false,
-	takeout: false,
-	isTableFee: false,
-	label: '',
-	type: '',
-	inputValue: ''
+  shopInfo: {
+    status: 2,
+    isAccountPay: 0,
+    isMemberPrice: 0,
+  },
+  extendList: [],
+  registerTypeList: [
+    { name: "先付费", value: "before" },
+    { name: "后付费", value: "after" },
+  ],
+  extendIndex: 0,
+  extendInfo: {},
+  dineIn: false,
+  takeout: false,
+  isTableFee: false,
+  label: "",
+  type: "",
+  inputValue: "",
 });
 onMounted(() => {
-	shopExtend();
+  shopExtend();
 });
 
 onShow(() => {
-	shopInfo();
-	uni.$on('refreshPreviousPage', (params) => {
-		// 这里执行刷新数据的操作，例如重新调用API获取数据
-		refreshData(params);
-	});
+  shopInfo();
+  uni.$on("refreshPreviousPage", (params) => {
+    // 这里执行刷新数据的操作，例如重新调用API获取数据
+    refreshData(params);
+  });
 });
 
 /**
  * 输入内容修改
  */
 let refreshData = (e) => {
-	let params = {
-		id: vdata.shopInfo.id
-	};
-	params[e.name] = e.value;
-	vdata.type = e.name;
-	vdata.inputValue = e.value;
-	updateShopInfo(params, 'input');
+  let params = {
+    id: vdata.shopInfo.id,
+  };
+  params[e.name] = e.value;
+  vdata.type = e.name;
+  vdata.inputValue = e.value;
+  updateShopInfo(params, "input");
 };
 
 /**
  * 获取店铺信息
  */
 const shopInfo = () => {
-	getShopInfo({ id: uni.getStorageSync('shopInfo').id }).then((res) => {
-		vdata.isTableFee = res.isTableFee == 1 ? true : false;
-		if (res.eatModel.split(',').indexOf('dine-in') != -1) {
-			vdata.dineIn = true;
-		}
-		if (res.eatModel.split(',').indexOf('take-out') != -1) {
-			vdata.takeout = true;
-		}
-		vdata.shopInfo = res;
-	});
+  getShopInfo({ id: uni.getStorageSync("shopInfo").id }).then((res) => {
+    vdata.isTableFee = res.isTableFee == 1 ? true : false;
+    if (res.eatModel.split(",").indexOf("dine-in") != -1) {
+      vdata.dineIn = true;
+    }
+    if (res.eatModel.split(",").indexOf("take-out") != -1) {
+      vdata.takeout = true;
+    }
+    vdata.shopInfo = res;
+  });
 };
 
 /**
  * 获取店铺图片
  */
 let shopExtend = () => {
-	getShopExtend().then((res) => {
-		if (res && res.length > 0) {
-			vdata.extendList = res;
-			vdata.extendIndex = 0;
-			vdata.extendInfo = res[0];
-		}
-	});
+  getShopExtend().then((res) => {
+    if (res && res.length > 0) {
+      vdata.extendList = res;
+      vdata.extendIndex = 0;
+      vdata.extendInfo = res[0];
+    }
+  });
 };
 
 // 台桌清理模式修改
 function tableClearChange(n) {
-	let params = {
-		id: vdata.shopInfo.id,
-		tableClearType: n
-	};
-	updateShopInfo(params);
+  let params = {
+    id: vdata.shopInfo.id,
+    tableClearType: n,
+  };
+  updateShopInfo(params);
 }
 
 /**
  * 付费模式修改
  */
 let radioChange = (n) => {
-	let params = {
-		id: vdata.shopInfo.id,
-		registerType: n
-	};
-	updateShopInfo(params);
+  let params = {
+    id: vdata.shopInfo.id,
+    registerType: n,
+  };
+  updateShopInfo(params);
 };
 
 /**
  * 修改
  */
 let updateShopInfo = (params, type) => {
-	editShopInfo(params).then((res) => {
-		if (type && type == 'input') {
-			vdata.shopInfo[vdata.type] = vdata.inputValue;
-		}
-	});
+  editShopInfo(params).then((res) => {
+    if (res) {
+      uni.showToast({
+        title: "修改成功",
+        icon: "none",
+      });
+    } else {
+      uni.showToast({
+        title: "修改失败",
+        icon: "none",
+      });
+    }
+    if (type && type == "input") {
+      vdata.shopInfo[vdata.type] = vdata.inputValue;
+    }
+  });
 };
 
 /**
  * 修改店铺图片
  */
 let updateShopExtend = () => {
-	editShopExtend({
-		autokey: vdata.extendInfo.autoKey,
-		value: vdata.extendInfo.value
-	}).then((res) => {});
+  editShopExtend({
+    autokey: vdata.extendInfo.autoKey,
+    value: vdata.extendInfo.value,
+  }).then((res) => {});
 };
 
 /**
  * 上传头像
  */
 let chooseAndUploadAvatar = (type) => {
-	// 选择图片
-	uni.chooseImage({
-		count: 1, // 默认为1，只选择一张图片
-		sizeType: ['original', 'compressed'], // 图片质量，原图或压缩
-		sourceType: ['album', 'camera'], // 图片来源，相册或相机
-		success: (res) => {
-			let file = res.tempFiles[0];
-			uploadFile(file)
-				.then((res) => {
-					if (type == 'coverImg') {
-						vdata.shopInfo.coverImg = res;
-						let params = {
-							id: vdata.shopInfo.id,
-							coverImg: vdata.shopInfo.coverImg
-						};
-						updateShopInfo(params);
-					}
-					if (type == 'extendUp') {
-						vdata.extendInfo.value = res;
-						updateShopExtend();
-					}
-				})
-				.catch((res) => {
-					if (res.errMsg) {
-						uni.showToast({
-							title: '图片大小超出限制',
-							icon: 'error'
-						});
-					}
-				});
-		},
-		fail: (chooseImageError) => {
-			// 选择图片失败处理逻辑
-			console.log('choose image fail:', chooseImageError);
-		}
-	});
+  // 选择图片
+  uni.chooseImage({
+    count: 1, // 默认为1，只选择一张图片
+    sizeType: ["original", "compressed"], // 图片质量，原图或压缩
+    sourceType: ["album", "camera"], // 图片来源，相册或相机
+    success: (res) => {
+      let file = res.tempFiles[0];
+      uploadFile(file)
+        .then((res) => {
+          if (type == "coverImg") {
+            vdata.shopInfo.coverImg = res;
+            let params = {
+              id: vdata.shopInfo.id,
+              coverImg: vdata.shopInfo.coverImg,
+            };
+            updateShopInfo(params);
+          }
+          if (type == "extendUp") {
+            vdata.extendInfo.value = res;
+            updateShopExtend();
+          }
+        })
+        .catch((res) => {
+          if (res.errMsg) {
+            uni.showToast({
+              title: "图片大小超出限制",
+              icon: "error",
+            });
+          }
+        });
+    },
+    fail: (chooseImageError) => {
+      // 选择图片失败处理逻辑
+      console.log("choose image fail:", chooseImageError);
+    },
+  });
 };
 
 /**
  * 店铺图片TAB切换
  */
 let extendTabClick = (item, index) => {
-	vdata.extendInfo = item;
-	vdata.extendIndex = index;
+  vdata.extendInfo = item;
+  vdata.extendIndex = index;
 };
 
 /**
  * 是否免桌位费
  */
 let isTableFeeChange = (e) => {
-	if (e) {
-		vdata.isTableFee = true;
-	} else {
-		vdata.isTableFee = false;
-	}
-	switchChange('isTableFee');
+  if (e) {
+    vdata.isTableFee = true;
+  } else {
+    vdata.isTableFee = false;
+  }
+  switchChange("isTableFee");
 };
 
 /**
  * 修改
  */
 let switchChange = (type) => {
-	let params = {
-		id: vdata.shopInfo.id
-	};
-	switch (type) {
-		case 'address':
-			params.lng = vdata.shopInfo.lng;
-			params.lat = vdata.shopInfo.lat;
-			params.address = vdata.shopInfo.address;
-			break;
-		case 'status':
-			params.status = vdata.shopInfo.status;
-			break;
-		case 'eatModel':
-			params.eatModel = [];
-			if (vdata.dineIn) {
-				params.eatModel.push('dine-in');
-			}
-			if (vdata.takeout) {
-				params.eatModel.push('take-out');
-			}
-			params.eatModel = params.eatModel.join(',');
-			break;
-		case 'isAccountPay':
-			params.isAccountPay = vdata.shopInfo.isAccountPay;
-			break;
-		case 'isMemberPrice':
-			params.isMemberPrice = vdata.shopInfo.isMemberPrice;
-			break;
-		case 'isTableFee':
-			if (vdata.isTableFee) {
-				params.isTableFee = 1;
-			} else {
-				params.isTableFee = 0;
-			}
-			break;
-	}
-	updateShopInfo(params);
+  let params = {
+    id: vdata.shopInfo.id,
+  };
+  switch (type) {
+    case "address":
+      params.lng = vdata.shopInfo.lng;
+      params.lat = vdata.shopInfo.lat;
+      params.address = vdata.shopInfo.address;
+      break;
+    case "status":
+      params.status = vdata.shopInfo.status;
+      break;
+    case "eatModel":
+      params.eatModel = [];
+      if (vdata.dineIn) {
+        params.eatModel.push("dine-in");
+      }
+      if (vdata.takeout) {
+        params.eatModel.push("take-out");
+      }
+      params.eatModel = params.eatModel.join(",");
+      break;
+    case "isAccountPay":
+      params.isAccountPay = vdata.shopInfo.isAccountPay;
+      break;
+    case "isMemberPrice":
+      params.isMemberPrice = vdata.shopInfo.isMemberPrice;
+      break;
+    case "isTableFee":
+      if (vdata.isTableFee) {
+        params.isTableFee = 1;
+      } else {
+        params.isTableFee = 0;
+      }
+      break;
+    case "isOrderFence":
+      params.isOrderFence = vdata.shopInfo.isOrderFence;
+      break;
+  }
+  updateShopInfo(params);
 };
 
 /**
  * 选择地图
  */
 let showMap = () => {
-	// 本地 测试选择
-	// 打开地图
+  // 本地 测试选择
+  // 打开地图
 
-	uni.chooseLocation({
-		// type: 'wgs84',
-		success: function (res) {
-			vdata.shopInfo.lng = res.longitude.toFixed(6); // IOS 小程序中：  经纬度12位。
-			vdata.shopInfo.lat = res.latitude.toFixed(6);
-			vdata.shopInfo.address = res.name;
-			switchChange('address');
-		},
-		fail: function (err) {
-			console.log(err);
-			// uni.showToast({
-			// 	title:err,
-			// 	icon:'error'
-			// })
-		}
-	});
+  uni.chooseLocation({
+    // type: 'wgs84',
+    success: function (res) {
+      vdata.shopInfo.lng = res.longitude.toFixed(6); // IOS 小程序中：  经纬度12位。
+      vdata.shopInfo.lat = res.latitude.toFixed(6);
+      vdata.shopInfo.address = res.name;
+      switchChange("address");
+    },
+    fail: function (err) {
+      console.log(err);
+      // uni.showToast({
+      // 	title:err,
+      // 	icon:'error'
+      // })
+    },
+  });
 };
 </script>
 
 <style lang="scss" scoped>
 .page-wrapper {
-	background-color: #f8f8f8;
-	padding-bottom: 32rpx;
-	.page-cell {
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		padding: 32rpx 28rpx;
-		box-sizing: border-box;
-		background-color: #fff;
-		.label {
-			font-weight: bold;
-			font-size: 28rpx;
-			color: #333333;
-			display: flex;
-			align-items: center;
-			flex-shrink: 0;
-			margin-right: 20rpx;
-			.tableFee {
-				width: 186rpx;
-				height: 54rpx;
-				line-height: 54rpx;
-				margin-left: 10rpx;
-				font-size: 28rpx;
-				color: #333;
-				border-radius: 8rpx 8rpx 8rpx 8rpx;
-				border: 2rpx solid #e5e5e5;
-				text-align: left;
-				padding: 0 18rpx;
-				box-sizing: border-box;
-			}
-		}
-		.extendList {
-			width: 100%;
-			display: flex;
-			flex-direction: column;
-			margin-top: 24rpx;
-			.extendTab {
-				display: flex;
-				justify-content: flex-start;
-				.extendTab_item {
-					font-size: 24rpx;
-					font-weight: 400;
-					padding: 4rpx 12rpx;
-					border-radius: 4rpx;
-					border: 2rpx solid #e5e5e5;
-					margin-right: 20rpx;
-				}
-				.active {
-					background: #318afe;
-					border: 2rpx solid #318afe;
-					color: #fff;
-				}
-			}
-			.extend_content {
-				display: flex;
-				margin-top: 32rpx;
-				.preview {
-					min-width: 146rpx;
-					height: 342rpx;
-					position: relative;
-					margin-right: 32rpx;
-					background-color: #f7f7f7;
-					::v-deep .bg,
-					::v-deep .bg .u-image,
-					::v-deep .bg .u-image__image {
-						width: 146rpx !important;
-						height: 342rpx !important;
-						position: absolute;
-						top: 0;
-					}
+  background-color: #f8f8f8;
+  padding-bottom: 32rpx;
+  .page-cell {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 32rpx 28rpx;
+    box-sizing: border-box;
+    background-color: #fff;
+    .label {
+      font-weight: bold;
+      font-size: 28rpx;
+      color: #333333;
+      display: flex;
+      align-items: center;
+      flex-shrink: 0;
+      margin-right: 20rpx;
+      .tableFee {
+        width: 186rpx;
+        height: 54rpx;
+        line-height: 54rpx;
+        margin-left: 10rpx;
+        font-size: 28rpx;
+        color: #333;
+        border-radius: 8rpx 8rpx 8rpx 8rpx;
+        border: 2rpx solid #e5e5e5;
+        text-align: left;
+        padding: 0 18rpx;
+        box-sizing: border-box;
+      }
+    }
+    .extendList {
+      width: 100%;
+      display: flex;
+      flex-direction: column;
+      margin-top: 24rpx;
+      .extendTab {
+        display: flex;
+        justify-content: flex-start;
+        .extendTab_item {
+          font-size: 24rpx;
+          font-weight: 400;
+          padding: 4rpx 12rpx;
+          border-radius: 4rpx;
+          border: 2rpx solid #e5e5e5;
+          margin-right: 20rpx;
+        }
+        .active {
+          background: #318afe;
+          border: 2rpx solid #318afe;
+          color: #fff;
+        }
+      }
+      .extend_content {
+        display: flex;
+        margin-top: 32rpx;
+        .preview {
+          min-width: 146rpx;
+          height: 342rpx;
+          position: relative;
+          margin-right: 32rpx;
+          background-color: #f7f7f7;
+          ::v-deep .bg,
+          ::v-deep .bg .u-image,
+          ::v-deep .bg .u-image__image {
+            width: 146rpx !important;
+            height: 342rpx !important;
+            position: absolute;
+            top: 0;
+          }
 
-					::v-deep .index_bg .u-image,
-					::v-deep .index_bg .u-image__image {
-						width: 146rpx !important;
-						height: 242rpx !important;
-						position: absolute;
-						top: 0;
-					}
+          ::v-deep .index_bg .u-image,
+          ::v-deep .index_bg .u-image__image {
+            width: 146rpx !important;
+            height: 242rpx !important;
+            position: absolute;
+            top: 0;
+          }
 
-					::v-deep .my_bg .u-image,
-					::v-deep .my_bg .u-image__image {
-						width: 146rpx !important;
-						height: 90rpx !important;
-						position: absolute;
-						top: 0;
-					}
+          ::v-deep .my_bg .u-image,
+          ::v-deep .my_bg .u-image__image {
+            width: 146rpx !important;
+            height: 90rpx !important;
+            position: absolute;
+            top: 0;
+          }
 
-					::v-deep .member_bg .u-image,
-					::v-deep .member_bg .u-image__image {
-						width: 34rpx !important;
-						height: 63rpx !important;
-						position: absolute;
-						top: 22rpx;
-						left: 0;
-						right: 0;
-						margin: auto;
-						border-radius: 5rpx !important;
-					}
+          ::v-deep .member_bg .u-image,
+          ::v-deep .member_bg .u-image__image {
+            width: 34rpx !important;
+            height: 63rpx !important;
+            position: absolute;
+            top: 22rpx;
+            left: 0;
+            right: 0;
+            margin: auto;
+            border-radius: 5rpx !important;
+          }
 
-					::v-deep .shopinfo_bg .u-image,
-					::v-deep .shopinfo_bg .u-image__image {
-						width: 146rpx !important;
-						height: 50rpx !important;
-						position: absolute;
-						top: 0;
-					}
-					::v-deep .bg.ticket_logo,
-					::v-deep .bg.ticket_logo .u-image,
-					::v-deep .bg.ticket_logo .u-image__image {
-						width: 359rpx !important;
-						height: 232rpx !important;
-						position: absolute;
-						top: 0;
-					}
-					::v-deep .ticket_logo.img .u-image,
-					::v-deep .ticket_logo.img .u-image__image {
-						width: 146rpx !important;
-						height: 50rpx !important;
-						position: absolute;
-						top: 0;
-						left: 10rpx;
-					}
+          ::v-deep .shopinfo_bg .u-image,
+          ::v-deep .shopinfo_bg .u-image__image {
+            width: 146rpx !important;
+            height: 50rpx !important;
+            position: absolute;
+            top: 0;
+          }
+          ::v-deep .bg.ticket_logo,
+          ::v-deep .bg.ticket_logo .u-image,
+          ::v-deep .bg.ticket_logo .u-image__image {
+            width: 359rpx !important;
+            height: 232rpx !important;
+            position: absolute;
+            top: 0;
+          }
+          ::v-deep .ticket_logo.img .u-image,
+          ::v-deep .ticket_logo.img .u-image__image {
+            width: 146rpx !important;
+            height: 50rpx !important;
+            position: absolute;
+            top: 0;
+            left: 10rpx;
+          }
 
-					.shopinfo_bg_f {
-						width: 146rpx;
-						height: 290rpx;
-						position: absolute;
-						bottom: 0;
-						background-color: #fff;
-					}
-				}
-				.extend_img {
-					display: flex;
-					flex-direction: column;
-					.extend_title {
-						font-weight: 400;
-						font-size: 24rpx;
-						color: #333333;
-						margin-bottom: 16rpx;
-					}
-					.fileUp {
-						width: 148rpx;
-						height: 148rpx;
-						position: relative;
-						.file {
-							width: 148rpx;
-							height: 148rpx;
-							position: absolute;
-							top: 0;
-						}
-					}
-					::v-deep .u-image,
-					::v-deep .u-image__image {
-						width: 148rpx !important;
-						height: 148rpx !important;
-					}
-				}
-			}
-		}
-	}
-	.column {
-		flex-direction: column;
-		.label {
-			align-self: flex-start;
-		}
-	}
-	.m {
-		margin-bottom: 12rpx;
-	}
-	.cutShop {
-		width: 530rpx;
-		height: 80rpx;
-		line-height: 80rpx;
-		background: #318afe;
-		border-radius: 56rpx;
-		font-weight: 500;
-		font-size: 32rpx;
-		color: #ffffff;
-		margin: 48rpx auto 0 auto;
-		text-align: center;
-	}
+          .shopinfo_bg_f {
+            width: 146rpx;
+            height: 290rpx;
+            position: absolute;
+            bottom: 0;
+            background-color: #fff;
+          }
+        }
+        .extend_img {
+          display: flex;
+          flex-direction: column;
+          .extend_title {
+            font-weight: 400;
+            font-size: 24rpx;
+            color: #333333;
+            margin-bottom: 16rpx;
+          }
+          .fileUp {
+            width: 148rpx;
+            height: 148rpx;
+            position: relative;
+            .file {
+              width: 148rpx;
+              height: 148rpx;
+              position: absolute;
+              top: 0;
+            }
+          }
+          ::v-deep .u-image,
+          ::v-deep .u-image__image {
+            width: 148rpx !important;
+            height: 148rpx !important;
+          }
+        }
+      }
+    }
+  }
+  .column {
+    flex-direction: column;
+    .label {
+      align-self: flex-start;
+    }
+  }
+  .m {
+    margin-bottom: 12rpx;
+  }
+  .cutShop {
+    width: 530rpx;
+    height: 80rpx;
+    line-height: 80rpx;
+    background: #318afe;
+    border-radius: 56rpx;
+    font-weight: 500;
+    font-size: 32rpx;
+    color: #ffffff;
+    margin: 48rpx auto 0 auto;
+    text-align: center;
+  }
 
-	.right {
-		display: flex;
-		align-items: center;
-		font-weight: 400;
-		font-size: 28rpx;
-		color: #999999;
-		position: relative;
+  .right {
+    display: flex;
+    align-items: center;
+    font-weight: 400;
+    font-size: 28rpx;
+    color: #999999;
+    position: relative;
 
-		.file {
-			width: 112rpx;
-			height: 112rpx;
-			line-height: 112rpx;
-			position: absolute;
-			top: 0;
-			bottom: 0;
-			right: 0;
-			margin: auto;
-		}
+    .file {
+      width: 112rpx;
+      height: 112rpx;
+      line-height: 112rpx;
+      position: absolute;
+      top: 0;
+      bottom: 0;
+      right: 0;
+      margin: auto;
+    }
 
-		.fileImg {
-			width: 112rpx !important;
-			height: 112rpx !important;
-			::v-deep .u-avatar__image {
-				width: 112rpx !important;
-				height: 112rpx !important;
-			}
-		}
-	}
+    .fileImg {
+      width: 112rpx !important;
+      height: 112rpx !important;
+      ::v-deep .u-avatar__image {
+        width: 112rpx !important;
+        height: 112rpx !important;
+      }
+    }
+  }
 }
 </style>

From da321e3afc254b54463d05d08e6baa07d6414b66 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Tue, 2 Dec 2025 15:56:41 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E5=88=A0=E9=99=A4=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87=EF=BC=8C=E5=A2=9E=E5=8A=A0=E8=B6=85=E7=BA=A7?=
 =?UTF-8?q?=E4=BC=9A=E5=91=98=E9=A1=B5=E9=9D=A2=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 commons/style/vars.scss                       |    2 +-
 .../my-components/my-bottom-btn-group.vue     |   16 +-
 .../my-components/my-date-pickerview copy.vue |  597 ++++++++++
 components/my-components/my-footer-btn.vue    |  108 +-
 components/my-components/my-up-upload.vue     |  214 ++--
 components/my-components/my-upload-img.vue    |   89 ++
 http/api/market/member.js                     |   67 ++
 pageBwc/index/index.vue                       |    5 +-
 pageChat/index.vue                            |    3 +
 .../consumeCashback/components/config.vue     |    4 +-
 pageMarket/consumeCashback/index.vue          |    8 +-
 pageMarket/couponExchangeCode/detail.vue      |    4 +-
 pageMarket/couponExchangeCode/index.vue       |   22 +-
 pageMarket/distribution/components/config.vue |    5 +-
 pageMarket/distribution/level-list.vue        |   13 +-
 pageMarket/limitDiscount/index.vue            |    6 +-
 pageMarket/newUserDiscount/index.vue          |    2 +-
 pageMarket/orderRecommendation/index.vue      |    1 -
 pageMarket/rechargeExchangeCode/detail.vue    |    4 +-
 pageMarket/rechargeExchangeCode/index.vue     |    8 +-
 pageMarket/static/images/member.png           |  Bin 0 -> 936 bytes
 pageMarket/superVip/add-plans.vue             |  287 +++++
 pageMarket/superVip/components/config.vue     |  336 ++++++
 .../superVip/components/coupon-list.vue       |  110 ++
 .../superVip/components/fenxiao-mingxi.vue    |  197 ++++
 pageMarket/superVip/components/open-list.vue  |  258 ++++
 pageMarket/superVip/components/user-types.vue |   70 ++
 .../superVip/components/vip-lv-list.vue       |  172 +++
 pageMarket/superVip/index.vue                 |  447 +++++++
 pageMarket/superVip/level-list.vue            |  366 ++++++
 pageMarket/superVip/vip-lv-add.vue            |  363 ++++++
 pageMarket/superVip/vip-plans.vue             |  140 +++
 pageRecharge/components/recharge-item.vue     |    6 +-
 pageRecharge/index.vue                        |   12 +-
 pages.json                                    |   28 +
 pages/appliccation/marketing.vue              |    2 +-
 pages/permission/permission.vue               |    2 +-
 pages/shopSetUp/decoration.vue                | 1038 +++++++++--------
 static/applocation/birthdayGift.png           |  Bin 3323 -> 0 bytes
 static/applocation/bwc.png                    |  Bin 1444 -> 0 bytes
 static/applocation/cjhy.png                   |  Bin 900 -> 0 bytes
 static/applocation/czdhm.png                  |  Bin 957 -> 0 bytes
 static/applocation/czhd.png                   |  Bin 805 -> 0 bytes
 static/applocation/czqb.png                   |  Bin 943 -> 0 bytes
 static/applocation/dczntj.png                 |  Bin 895 -> 0 bytes
 static/applocation/dejbjq.png                 |  Bin 947 -> 0 bytes
 static/applocation/dxts.png                   |  Bin 945 -> 0 bytes
 static/applocation/fx.png                     |  Bin 1359 -> 0 bytes
 static/applocation/gdjkq.png                  |  Bin 813 -> 0 bytes
 static/applocation/jfsk.png                   |  Bin 1018 -> 0 bytes
 static/applocation/kctg.png                   |  Bin 857 -> 0 bytes
 static/applocation/mfpsq.png                  |  Bin 1046 -> 0 bytes
 static/applocation/mjhd.png                   |  Bin 1482 -> 0 bytes
 static/applocation/mjq.png                    |  Bin 962 -> 0 bytes
 static/applocation/mysyq.png                  |  Bin 930 -> 0 bytes
 static/applocation/myzy.png                   |  Bin 930 -> 0 bytes
 static/applocation/new_user_discount.png      |  Bin 1418 -> 0 bytes
 static/applocation/qdhm.png                   |  Bin 1111 -> 0 bytes
 static/applocation/spdhq.png                  |  Bin 792 -> 0 bytes
 static/applocation/sppt.png                   |  Bin 1084 -> 0 bytes
 static/applocation/sryl.png                   |  Bin 1082 -> 0 bytes
 static/applocation/super_vip.png              |  Bin 1157 -> 0 bytes
 static/applocation/syyl.png                   |  Bin 777 -> 0 bytes
 static/applocation/tcgg.png                   |  Bin 1039 -> 0 bytes
 static/applocation/tctg.png                   |  Bin 857 -> 0 bytes
 static/applocation/tshdxx.png                 |  Bin 896 -> 0 bytes
 static/applocation/wxgzh.png                  |  Bin 1049 -> 0 bytes
 static/applocation/xffx.png                   |  Bin 1146 -> 0 bytes
 static/applocation/xfzq.png                   |  Bin 857 -> 0 bytes
 static/applocation/xklj.png                   |  Bin 1142 -> 0 bytes
 static/applocation/xszk.png                   |  Bin 1407 -> 0 bytes
 static/applocation/yqlb.png                   |  Bin 774 -> 0 bytes
 static/applocation/zhcz.png                   |  Bin 935 -> 0 bytes
 static/applocation/zkq.png                    |  Bin 918 -> 0 bytes
 static/bgImg/quik-bg-img.svg                  |   20 -
 static/coupon/icon_coupon.svg                 |    1 -
 static/member_bg.png                          |  Bin 32975 -> 0 bytes
 static/uni.png                                |  Bin 4162 -> 0 bytes
 store/account.js                              |   12 +
 store/chat.js                                 |   17 +
 store/market.js                               |   45 +-
 81 files changed, 4395 insertions(+), 712 deletions(-)
 create mode 100644 components/my-components/my-date-pickerview copy.vue
 create mode 100644 components/my-components/my-upload-img.vue
 create mode 100644 http/api/market/member.js
 create mode 100644 pageChat/index.vue
 create mode 100644 pageMarket/static/images/member.png
 create mode 100644 pageMarket/superVip/add-plans.vue
 create mode 100644 pageMarket/superVip/components/config.vue
 create mode 100644 pageMarket/superVip/components/coupon-list.vue
 create mode 100644 pageMarket/superVip/components/fenxiao-mingxi.vue
 create mode 100644 pageMarket/superVip/components/open-list.vue
 create mode 100644 pageMarket/superVip/components/user-types.vue
 create mode 100644 pageMarket/superVip/components/vip-lv-list.vue
 create mode 100644 pageMarket/superVip/index.vue
 create mode 100644 pageMarket/superVip/level-list.vue
 create mode 100644 pageMarket/superVip/vip-lv-add.vue
 create mode 100644 pageMarket/superVip/vip-plans.vue
 delete mode 100644 static/applocation/birthdayGift.png
 delete mode 100644 static/applocation/bwc.png
 delete mode 100644 static/applocation/cjhy.png
 delete mode 100644 static/applocation/czdhm.png
 delete mode 100644 static/applocation/czhd.png
 delete mode 100644 static/applocation/czqb.png
 delete mode 100644 static/applocation/dczntj.png
 delete mode 100644 static/applocation/dejbjq.png
 delete mode 100644 static/applocation/dxts.png
 delete mode 100644 static/applocation/fx.png
 delete mode 100644 static/applocation/gdjkq.png
 delete mode 100644 static/applocation/jfsk.png
 delete mode 100644 static/applocation/kctg.png
 delete mode 100644 static/applocation/mfpsq.png
 delete mode 100644 static/applocation/mjhd.png
 delete mode 100644 static/applocation/mjq.png
 delete mode 100644 static/applocation/mysyq.png
 delete mode 100644 static/applocation/myzy.png
 delete mode 100644 static/applocation/new_user_discount.png
 delete mode 100644 static/applocation/qdhm.png
 delete mode 100644 static/applocation/spdhq.png
 delete mode 100644 static/applocation/sppt.png
 delete mode 100644 static/applocation/sryl.png
 delete mode 100644 static/applocation/super_vip.png
 delete mode 100644 static/applocation/syyl.png
 delete mode 100644 static/applocation/tcgg.png
 delete mode 100644 static/applocation/tctg.png
 delete mode 100644 static/applocation/tshdxx.png
 delete mode 100644 static/applocation/wxgzh.png
 delete mode 100644 static/applocation/xffx.png
 delete mode 100644 static/applocation/xfzq.png
 delete mode 100644 static/applocation/xklj.png
 delete mode 100644 static/applocation/xszk.png
 delete mode 100644 static/applocation/yqlb.png
 delete mode 100644 static/applocation/zhcz.png
 delete mode 100644 static/applocation/zkq.png
 delete mode 100644 static/bgImg/quik-bg-img.svg
 delete mode 100644 static/coupon/icon_coupon.svg
 delete mode 100644 static/member_bg.png
 delete mode 100644 static/uni.png
 create mode 100644 store/chat.js

diff --git a/commons/style/vars.scss b/commons/style/vars.scss
index 65ad362..48ea55d 100644
--- a/commons/style/vars.scss
+++ b/commons/style/vars.scss
@@ -40,7 +40,7 @@ $v-b-color-ed: #ededed;
 
 //common.scss 分包页面以及组件里所用的颜色
 $my-main-color:#318AFE;
-$my-red-color:#F02C45;
+$my-red-color:#FE4F1E;
 
 //my-components
 $u-main-color: #303133;
diff --git a/components/my-components/my-bottom-btn-group.vue b/components/my-components/my-bottom-btn-group.vue
index 56f6c02..489fcf1 100644
--- a/components/my-components/my-bottom-btn-group.vue
+++ b/components/my-components/my-bottom-btn-group.vue
@@ -1,5 +1,5 @@
 <template>
-  <view>
+  <view v-if="isShow">
     <view class="zhanwei" :class="[direction == 'column' ? 'zhanwei1' : '']"></view>
 
     <view
@@ -21,9 +21,15 @@
 </template>
 
 <script setup>
+import { computed } from "vue";
 const emit = defineEmits(["save", "cancel"]);
+import { isMainShop } from "@/store/account.js";
 
 const props = defineProps({
+  isOpenPermission: {
+    type: Boolean,
+    default: false,
+  },
   //方向 row横向布局 column 纵向布局
   direction: {
     type: String,
@@ -31,6 +37,14 @@ const props = defineProps({
   },
 });
 
+
+const isShow = computed(() => {
+  if (props.isOpenPermission) {
+    return isMainShop();
+  }
+  return true;
+});
+
 function save() {
   emit("save");
 }
diff --git a/components/my-components/my-date-pickerview copy.vue b/components/my-components/my-date-pickerview copy.vue
new file mode 100644
index 0000000..e8a64a4
--- /dev/null
+++ b/components/my-components/my-date-pickerview copy.vue	
@@ -0,0 +1,597 @@
+<template>
+  <view class="mask" v-if="show" @tap="close">
+    <view class="box" @tap.stop="nullFunction">
+      <view
+        class="u-flex u-relative u-row-center u-p-30 top"
+        v-if="props.isArea"
+      >
+        <view class="font-bold u-font-32">{{ props.title }}</view>
+        <view class="close" @tap="close">
+          <uni-icons type="closeempty" size="24"></uni-icons>
+        </view>
+      </view>
+      <view
+        class="u-p-30 u-flex u-flex-wrap gap-20 fastTime"
+        v-if="props.isArea"
+      >
+        <view
+          class="item"
+          v-for="(item, index) in fastTime"
+          :key="index"
+          @tap="changeTime(item)"
+        >
+          {{ item.label }}
+        </view>
+      </view>
+      <picker-view
+        :immediate-change="true"
+        @pickend="pickend"
+        :value="value"
+        @change="bindChange"
+        class="picker-view"
+      >
+        <template v-if="props.mode === 'all' || props.mode === 'date'">
+          <picker-view-column>
+            <view class="item" v-for="(item, index) in years" :key="index"
+              >{{ item }}年</view
+            >
+          </picker-view-column>
+          <picker-view-column>
+            <view class="item" v-for="(item, index) in months" :key="index"
+              >{{ item }}月</view
+            >
+          </picker-view-column>
+          <picker-view-column>
+            <view class="item" v-for="(item, index) in days" :key="index"
+              >{{ item }}日</view
+            >
+          </picker-view-column>
+        </template>
+        <template v-if="props.mode === 'all' || props.mode === 'time'">
+          <picker-view-column>
+            <view class="item" v-for="(item, index) in hours" :key="index"
+              >{{ item }}时</view
+            >
+          </picker-view-column>
+          <picker-view-column>
+            <view class="item" v-for="(item, index) in minutes" :key="index"
+              >{{ item }}分</view
+            >
+          </picker-view-column>
+          <picker-view-column>
+            <view class="item" v-for="(item, index) in seconds" :key="index"
+              >{{ item }}秒</view
+            >
+          </picker-view-column>
+        </template>
+      </picker-view>
+      <template v-if="props.isArea">
+        <view class="u-text-center color-999">至</view>
+        <picker-view
+          :immediate-change="true"
+          :value="value1"
+          @pickend="pickend1"
+          @change="bindChange1"
+          class="picker-view"
+        >
+          <template v-if="props.mode === 'all' || props.mode === 'date'">
+            <picker-view-column>
+              <view class="item" v-for="(item, index) in years" :key="index"
+                >{{ item }}年</view
+              >
+            </picker-view-column>
+            <picker-view-column>
+              <view class="item" v-for="(item, index) in months" :key="index"
+                >{{ item }}月</view
+              >
+            </picker-view-column>
+            <picker-view-column>
+              <view class="item" v-for="(item, index) in days1" :key="index"
+                >{{ item }}日</view
+              >
+            </picker-view-column>
+          </template>
+          <template v-if="props.mode === 'all' || props.mode === 'time'">
+            <picker-view-column>
+              <view class="item" v-for="(item, index) in hours" :key="index"
+                >{{ item }}时</view
+              >
+            </picker-view-column>
+            <picker-view-column>
+              <view class="item" v-for="(item, index) in minutes" :key="index"
+                >{{ item }}分</view
+              >
+            </picker-view-column>
+            <picker-view-column>
+              <view class="item" v-for="(item, index) in seconds" :key="index"
+                >{{ item }}秒</view
+              >
+            </picker-view-column>
+          </template>
+        </picker-view>
+      </template>
+
+      <!-- 占位 -->
+      <view style="height: 80px"></view>
+      <template v-if="props.isArea">
+        <view class="fixed_b">
+          <my-button shape="circle" @tap="confirm">确定</my-button>
+        </view>
+      </template>
+      <template v-else>
+        <view class="fixed_b u-flex u-row-center">
+          <view class="u-m-r-16">
+            <my-button type="cancel" @tap="close" width="240">
+              <view class="color-999">取消</view>
+            </my-button>
+          </view>
+          <view class="u-m-l-16">
+            <button @tap="confirm">确定</button>
+          </view>
+        </view>
+      </template>
+    </view>
+  </view>
+</template>
+
+<script setup>
+import { reactive, nextTick, ref } from "vue";
+
+import dayjs from "dayjs";
+const $time = {
+  // 获取今天的开始和结束时间
+  getTodayTimestamps() {
+    const start = dayjs().startOf("day").format("YYYY-MM-DD HH:mm:ss");
+    const end = dayjs().endOf("day").format("YYYY-MM-DD HH:mm:ss");
+    return { start, end, label: "今日" };
+  },
+
+  // 获取昨天的开始和结束时间
+  getYesterdayTimestamps() {
+    const start = dayjs()
+      .subtract(1, "day")
+      .startOf("day")
+      .format("YYYY-MM-DD HH:mm:ss");
+    const end = dayjs()
+      .subtract(1, "day")
+      .endOf("day")
+      .format("YYYY-MM-DD HH:mm:ss");
+    return { start, end, label: "昨日" };
+  },
+
+  // 获取本周的开始和结束时间
+  getThisWeekTimestamps() {
+    const start = dayjs().startOf("week").format("YYYY-MM-DD HH:mm:ss");
+    const end = dayjs().endOf("week").format("YYYY-MM-DD HH:mm:ss");
+    return { start, end, label: "本周" };
+  },
+
+  // 获取本月的开始和结束时间
+  getThisMonthTimestamps() {
+    const start = dayjs().startOf("month").format("YYYY-MM-DD HH:mm:ss");
+    const end = dayjs().endOf("month").format("YYYY-MM-DD HH:mm:ss");
+    return { start, end, label: "本月" };
+  },
+
+  // 获取上个月的开始和结束时间
+  getThisLastMonthTimestamps() {
+    const start = dayjs()
+      .subtract(1, "month")
+      .startOf("month")
+      .format("YYYY-MM-DD HH:mm:ss");
+    const end = dayjs()
+      .subtract(1, "month")
+      .endOf("month")
+      .format("YYYY-MM-DD HH:mm:ss");
+    return { start, end, label: "上月" };
+  },
+};
+
+const props = defineProps({
+  selTime: {
+    type: [String, Number],
+  },
+  defaultIndex: {
+    type: Array,
+    default: () => {
+      return [];
+    },
+  },
+  defaultTime: {
+    type: Array,
+    default: () => {
+      return [];
+    },
+  },
+  title: {
+    type: String,
+    default: "筛选日期时间",
+  },
+  isArea: {
+    //是否选中范围时间
+    type: Boolean,
+    default: true,
+  },
+  mode: {
+    //all date time
+    type: String,
+    default: "time",
+  },
+  yearsLen: {
+    type: Number,
+    default: 30,
+  },
+});
+const $nowDate = new Date();
+const nowDate = {
+  year: $nowDate.getFullYear(),
+  month: $nowDate.getMonth() + 1,
+  day: $nowDate.getDate(),
+  hours: $nowDate.getHours(),
+  minutes: $nowDate.getMinutes(),
+  seconds: $nowDate.getSeconds(),
+};
+const yearsLen = props.yearsLen;
+
+function returnYears() {
+  if (props.isArea) {
+    return new Array(yearsLen)
+      .fill(1)
+      .map((v, index) => {
+        return nowDate.year - index;
+      })
+      .reverse();
+  } else {
+    return new Array(yearsLen).fill(1).map((v, index) => {
+      return nowDate.year - Math.floor(yearsLen / 2) + index;
+    });
+  }
+}
+const years = returnYears();
+
+const months = new Array(12).fill(1).map((v, index) => {
+  return index + 1;
+});
+const days = ref(
+  new Array(getMonthArea($nowDate, "end").getDate()).fill(1).map((v, index) => {
+    return index + 1;
+  })
+);
+const days1 = ref(
+  new Array(getMonthArea($nowDate, "end").getDate()).fill(1).map((v, index) => {
+    return index + 1;
+  })
+);
+const hours = new Array(24).fill(1).map((v, index) => {
+  return index;
+});
+const minutes = new Array(60).fill(1).map((v, index) => {
+  return index;
+});
+const seconds = new Array(60).fill(1).map((v, index) => {
+  return index;
+});
+// const fastTime = reactive([{
+// 		title: '今日',
+// 		key: 'now'
+// 	},
+// 	{
+// 		title: '昨日',
+// 		key: 'prve'
+// 	},
+// 	{
+// 		title: '本月',
+// 		key: 'nowMonth'
+// 	},
+// 	{
+// 		title: '上月',
+// 		key: 'prveMonth'
+// 	}
+// ])
+const today = $time.getTodayTimestamps();
+const yesterday = $time.getYesterdayTimestamps();
+const thisMonth = $time.getThisMonthTimestamps();
+const thisLastMonth = $time.getThisLastMonthTimestamps();
+const fastTime = reactive([today, yesterday, thisMonth, thisLastMonth]);
+
+function setPrveDay() {}
+
+function setNowMoneth() {}
+
+function setprveMoneth() {}
+
+function setDay(start, end) {
+  value.value = [start.year, start.month, start.day, 0, 0, 0];
+  value1.value = [end.year, end.month, end.day, 23, 59, 59];
+}
+
+function changeTime(e) {
+  console.log(e);
+  const start = e.start;
+  const end = e.end;
+  emits("confirm", {
+    text: `${start}——${end}`,
+    start,
+    end,
+  });
+  close();
+}
+let value = ref([]);
+let value1 = ref([]);
+initValue();
+
+function returnFindIndex(arr) {
+  const yearIndex = years.findIndex((v) => v == arr[0]);
+  const monthIndex = arr[1];
+  const dayIndex = arr[2] - 1;
+  const hIndex = arr[3];
+  const mIndex = arr[4];
+  const sIndex = arr[5];
+  return [yearIndex, monthIndex, dayIndex, hIndex, mIndex, sIndex];
+}
+
+function initValue() {
+  if (props.defaultTime.length && !props.isArea) {
+    value.value = returnFindIndex(props.defaultTime);
+  } else {
+    const yearIndex = years.findIndex((v) => v == nowDate.year);
+    value.value = [yearIndex, nowDate.month - 1, nowDate.day - 1, 0, 0, 0];
+    value1.value = [yearIndex, nowDate.month - 1, nowDate.day - 1, 23, 59, 59];
+  }
+}
+
+let show = ref(false);
+const emits = defineEmits("close", "open", "confirm");
+
+function toggle() {
+  show.value = !show.value;
+  if (show.value) {
+    open();
+  } else {
+    close();
+  }
+}
+
+function close() {
+  show.value = false;
+  // emits('close', false)
+}
+
+function open() {
+  if (typeof props.selTime === "number") {
+    const d = new Date(props.selTime);
+    value.value[0] = years.findIndex((v) => v === d.getFullYear());
+    value.value[1] = months.findIndex((v) => v === d.getMonth()) + 1;
+    value.value[2] = days.value.findIndex((v) => v === d.getDate());
+  }
+  show.value = true;
+  // emits('open', true)
+}
+
+function returnDateString(arr, isObj) {
+  const year = years[arr[0]];
+  const month = arr[1] + 1;
+  const day = arr[2] + 1;
+  const hour = ("0" + (arr[3] || 0)).slice(-2);
+  const min = ("0" + (arr[4] || 0)).slice(-2);
+  const sen = ("0" + (arr[5] || 0)).slice(-2);
+  if (isObj) {
+    return new Date(year, month, day, hour, min, sen);
+  }
+  return `${year}-${month}-${day} ${hour}:${min}:${sen}`;
+}
+
+function confirm(e) {
+  const start = returnDateString(value.value);
+  const end = returnDateString(value1.value);
+  if (!props.isArea) {
+    emits("confirm", start);
+  } else {
+    emits("confirm", {
+      text: `${start}——${end}`,
+      start,
+      end,
+    });
+  }
+
+  close();
+}
+
+function returnMonthStart(arr) {
+  return new Date(years[arr[0]], months[arr[1]] - 1, 1).getDate();
+}
+
+function returnMonthEnd(arr) {
+  return new Date(years[arr[0]], months[arr[1]], 0).getDate();
+}
+
+//防抖
+function debounce(fn, wait) {
+  let timeout = null;
+  return function () {
+    let context = this;
+    let args = arguments;
+    if (timeout) clearTimeout(timeout);
+    let callNow = !timeout;
+    timeout = setTimeout(() => {
+      timeout = null;
+    }, wait);
+    if (callNow) fn.apply(context, args);
+  };
+}
+
+/**
+ * @param {Object} isDays1 //是否是结束时间选择
+ * @param {Object} arr
+ */
+function changeDays(isDays1, arr) {
+  const end = returnMonthEnd(arr);
+  if (end) {
+    if (isDays1) {
+      days1.value = new Array(end).fill(1).map((v, index) => {
+        return index + 1;
+      });
+    } else {
+      days.value = new Array(end).fill(1).map((v, index) => {
+        return index + 1;
+      });
+    }
+  }
+}
+
+function bindChange(e) {
+  const startTotal = returnDateString(e.detail.value, true).getTime();
+  const endTotal = returnDateString(value1.value, true).getTime();
+  value.value = e.detail.value;
+  setTimeout(() => {
+    if (props.isArea) {
+      value.value = startTotal > endTotal ? value1.value : e.detail.value;
+    }
+    debounce(changeDays(false, value.value), 100);
+  }, 10);
+  // nextTick(() => {
+  // 	if (props.isArea) {
+  // 		value.value = startTotal > endTotal ? value1.value : e.detail.value
+  // 	}
+  // 	console.log(value.value);
+  // 	debounce(changeDays(false, value.value), 100)
+  // })
+}
+
+function bindChange1(e) {
+  const startTotal = returnDateString(value.value, true).getTime();
+  const endTotal = returnDateString(e.detail.value, true).getTime();
+  value1.value = e.detail.value;
+  nextTick(() => {
+    if (props.isArea) {
+      value1.value = endTotal < startTotal ? value.value : e.detail.value;
+    }
+    debounce(changeDays(true, value1.value), 100);
+  });
+}
+
+function getDayDate(date = new Date(), type) {
+  const now = date;
+  if (type === "start") {
+    const startOfDay = new Date(
+      now.getFullYear(),
+      now.getMonth(),
+      now.getDate()
+    );
+    return startOfDay;
+  }
+  if (type === "end") {
+    const endOfDay = new Date(
+      now.getFullYear(),
+      now.getMonth(),
+      now.getDate(),
+      23,
+      59,
+      59,
+      999
+    );
+    return endOfDay;
+  }
+}
+
+function getMonthArea(date = new Date(), type) {
+  let now = date;
+  let currentMonthStart = new Date(now.getFullYear(), now.getMonth(), 1);
+  let currentMonthEnd = new Date(
+    now.getFullYear(),
+    now.getMonth() + 1,
+    0,
+    23,
+    59,
+    59,
+    999
+  );
+  if (type === "start") {
+    return currentMonthStart;
+  }
+  if (type === "end") {
+    return currentMonthEnd;
+  }
+  return {
+    start: currentMonthStart,
+    end: currentMonthEnd,
+  };
+}
+
+function nullFunction() {}
+
+function pickend(e) {
+  console.log(e);
+}
+
+function pickend1(e) {
+  console.log(e);
+}
+defineExpose({
+  close,
+  open,
+  confirm,
+  toggle,
+});
+</script>
+
+<style lang="scss" scoped>
+.fastTime {
+  .item {
+    background-color: rgb(247, 247, 247);
+    padding: 6rpx 40rpx;
+    border-radius: 6rpx;
+    font-size: 32rpx;
+  }
+}
+
+.top {
+  border-bottom: 1px solid #eee;
+}
+
+.close {
+  position: absolute;
+  top: 50%;
+  transform: translateY(-50%);
+  right: 30rpx;
+}
+
+.mask {
+  position: fixed;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  top: 0;
+  z-index: 9999;
+  background-color: rgba(51, 51, 51, 0.5);
+
+  .item {
+    line-height: 34px;
+    text-align: center;
+  }
+
+  .box {
+    position: absolute;
+    background-color: #fff;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    border-radius: 16rpx 16rpx 0 0;
+  }
+}
+
+.fixed_b {
+  position: absolute;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  padding: 30rpx;
+  z-index: 100;
+  background-color: #fff;
+}
+
+.picker-view {
+  width: 750rpx;
+  height: 300rpx;
+}
+</style>
diff --git a/components/my-components/my-footer-btn.vue b/components/my-components/my-footer-btn.vue
index 8fe2d65..353063f 100644
--- a/components/my-components/my-footer-btn.vue
+++ b/components/my-components/my-footer-btn.vue
@@ -1,56 +1,78 @@
 <template>
-	<view class="fixed-wrap" :style="{ '--num': showCancel ? '63px' : '0px' }">
-		<view class="fixed-btn" id="targetRef">
-			<div class="btn">
-				<u-button type="primary" :shape="shape" size="large" @click="emits('confirm')">{{ confirmText }}</u-button>
-			</div>
-			<div class="btn" v-if="showCancel">
-				<u-button :shape="shape" size="large" @click="emits('cancel')">取消</u-button>
-			</div>
-		</view>
-	</view>
+  <view
+    class="fixed-wrap"
+    :style="{ '--num': showCancel ? '63px' : '0px' }"
+    v-if="isShow"
+  >
+    <view class="fixed-btn" id="targetRef">
+      <div class="btn">
+        <u-button
+          type="primary"
+          :shape="shape"
+          size="large"
+          @click="emits('confirm')"
+          >{{ confirmText }}</u-button
+        >
+      </div>
+      <div class="btn" v-if="showCancel">
+        <u-button :shape="shape" size="large" @click="emits('cancel')"
+          >取消</u-button
+        >
+      </div>
+    </view>
+  </view>
 </template>
 
 <script setup>
-import { ref, onMounted, nextTick, getCurrentInstance } from 'vue';
+import { ref, onMounted, nextTick, getCurrentInstance } from "vue";
+import { isMainShop } from "@/store/account.js";
 
 const props = defineProps({
-	confirmText: {
-		type: String,
-		default: '保存'
-	},
-	showCancel: {
-		type: Boolean,
-		default: false
-	},
-	shape: {
-		type: String,
-		default: 'circle' // squre circle
-	}
+  isOpenPermission: {
+    type: Boolean,
+    default: true,
+  },
+  confirmText: {
+    type: String,
+    default: "保存",
+  },
+  showCancel: {
+    type: Boolean,
+    default: false,
+  },
+  shape: {
+    type: String,
+    default: "circle", // squre circle
+  },
 });
-
-const emits = defineEmits(['confirm', 'cancel']);
+const isShow = computed(() => {
+  if (props.isOpenPermission) {
+    return isMainShop();
+  }
+  return true;
+});
+const emits = defineEmits(["confirm", "cancel"]);
 </script>
 
 <style scoped lang="scss">
 .fixed-wrap {
-	--height: calc(83px + var(--num) + env(safe-area-inset-bottom) / 2);
-	width: 100%;
-	height: var(--height);
-	.fixed-btn {
-		width: 100%;
-		height: var(--height);
-		position: fixed;
-		bottom: 0;
-		left: 0;
-		z-index: 99;
-		padding: 10px 14px calc(20px + env(safe-area-inset-bottom) / 2) 10px;
-		background-color: #fff;
-		.btn {
-			&:first-child {
-				margin-bottom: 14px;
-			}
-		}
-	}
+  --height: calc(83px + var(--num) + env(safe-area-inset-bottom) / 2);
+  width: 100%;
+  height: var(--height);
+  .fixed-btn {
+    width: 100%;
+    height: var(--height);
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    z-index: 99;
+    padding: 10px 14px calc(20px + env(safe-area-inset-bottom) / 2) 10px;
+    background-color: #fff;
+    .btn {
+      &:first-child {
+        margin-bottom: 14px;
+      }
+    }
+  }
 }
 </style>
diff --git a/components/my-components/my-up-upload.vue b/components/my-components/my-up-upload.vue
index ac091a2..e82600d 100644
--- a/components/my-components/my-up-upload.vue
+++ b/components/my-components/my-up-upload.vue
@@ -1,113 +1,125 @@
 <template>
-	<up-upload :fileList="images" @afterRead="afterRead" @delete="deletePic" :multiple="multiple" :width="width"
-		:height="height" :maxCount="maxCount"></up-upload>
+  <up-upload
+    :fileList="images"
+    @afterRead="afterRead"
+    @delete="deletePic"
+    :multiple="multiple"
+    :width="width"
+    :height="height"
+    :maxCount="maxCount"
+  >
+  <template #default v-if="$slots.default">
+	<slot></slot>
+  </template>
+  </up-upload>
 </template>
 
 <script setup>
-	import { ref, watch } from 'vue';
-	import { uploadFile } from '@/http/api/index.js'
+import { ref, watch } from "vue";
+import { uploadFile } from "@/http/api/index.js";
 
-	const props = defineProps({
-		modelValue: {
-			type: Array,
-			default: () => []
-		},
-		width: {
-			type: [String, Number],
-			default: 60
-		},
-		height: {
-			type: [String, Number],
-			default: 60
-		},
-		maxCount: {
-			type: [Number],
-			default: 10
-		},
-		multiple: {
-			type: Boolean,
-			default: true
-		}
-	})
+const props = defineProps({
+  modelValue: {
+    type: Array,
+    default: () => [],
+  },
+  width: {
+    type: [String, Number],
+    default: 60,
+  },
+  height: {
+    type: [String, Number],
+    default: 60,
+  },
+  maxCount: {
+    type: [Number],
+    default: 10,
+  },
+  multiple: {
+    type: Boolean,
+    default: true,
+  },
+});
 
+const emits = defineEmits(["update:modelValue"]);
+const images = ref(props.modelValue);
 
-	const emits = defineEmits(['update:modelValue'])
-	const images = ref(props.modelValue)
-	
-	
-	
-	function uploadfile(par){
-		let file=null;
-		// #ifdef H5
-		file= par.file
-		// #endif
-		// #ifndef H5
-		file= par
-		// #endif
-		return uploadFile(file)
-	}
-	
-	function afterRead(e) {
-		console.log(e);
-		if (Array.isArray(e.file)) {
-			for (let i in e.file) {
-				const file = e.file[i]
-				console.log(file);
-				uploadfile(file).then(res => {
-					console.log(res);
-					images.value.push({
-						url: e.file[i].url,
-						serveUrl: res
-					})
-				}).catch(res => {
-					console.log(res);
-					if (res.errMsg) {
-						images.value.splice(i, 1)
-						uni.showToast({
-							title: '图片大小超出限制',
-							icon: 'error'
-						})
-					}
+function uploadfile(par) {
+  let file = null;
+  // #ifdef H5
+  file = par.file;
+  // #endif
+  // #ifndef H5
+  file = par;
+  // #endif
+  return uploadFile(file);
+}
 
-				})
-			}
-		}else{
-			const i=0
-			uploadfile(e.file).then(res => {
-				console.log(res);
-				images.value.push({
-					url: e.file.url,
-					serveUrl: res
-				})
-			}).catch(res => {
-				console.log(res);
-				if (res.errMsg) {
-					images.value.splice(i, 1)
-					uni.showToast({
-						title: '图片大小超出限制',
-						icon: 'error'
-					})
-				}
-			
-			})
-		}
+function afterRead(e) {
+  console.log(e);
+  if (Array.isArray(e.file)) {
+    for (let i in e.file) {
+      const file = e.file[i];
+      console.log(file);
+      uploadfile(file)
+        .then((res) => {
+          console.log(res);
+          images.value.push({
+            url: e.file[i].url,
+            serveUrl: res,
+          });
+        })
+        .catch((res) => {
+          console.log(res);
+          if (res.errMsg) {
+            images.value.splice(i, 1);
+            uni.showToast({
+              title: "图片大小超出限制",
+              icon: "error",
+            });
+          }
+        });
+    }
+  } else {
+    const i = 0;
+    uploadfile(e.file)
+      .then((res) => {
+        console.log(res);
+        images.value.push({
+          url: e.file.url,
+          serveUrl: res,
+        });
+      })
+      .catch((res) => {
+        console.log(res);
+        if (res.errMsg) {
+          images.value.splice(i, 1);
+          uni.showToast({
+            title: "图片大小超出限制",
+            icon: "error",
+          });
+        }
+      });
+  }
+}
 
-	}
+function deletePic(e) {
+  const { index } = e;
+  images.value.splice(index, 1);
+}
 
-	function deletePic(e) {
-		const {
-			index
-		} = e
-		images.value.splice(index, 1)
-	}
-
-	watch(() => images.value, (newval) => {
-		emits('update:modelValue', newval)
-	})
-	watch(() => props.modelValue, (newval) => {
-		images.value = newval
-	})
+watch(
+  () => images.value,
+  (newval) => {
+    emits("update:modelValue", newval);
+  }
+);
+watch(
+  () => props.modelValue,
+  (newval) => {
+    images.value = newval;
+  }
+);
 </script>
 
-<style>
-</style>
\ No newline at end of file
+<style></style>
diff --git a/components/my-components/my-upload-img.vue b/components/my-components/my-upload-img.vue
new file mode 100644
index 0000000..50c5b46
--- /dev/null
+++ b/components/my-components/my-upload-img.vue
@@ -0,0 +1,89 @@
+<template>
+  <view class="upload-file" @click="chooseImage">
+    <slot v-if="$slots.default"></slot>
+    <view class="icon" v-if="!modelValue"> + </view>
+    <image class="img" v-else :src="modelValue"></image>
+
+	<view class="close" @click.stop="()=>{}" v-if="modelValue">
+		<up-icon name="close-circle" color="#333" size="14" @click="clearImg" ></up-icon>
+	</view>
+  </view>
+</template>
+
+<script setup>
+import { uploadFile } from "@/http/api/index.js";
+
+import { reactive, ref, watch } from "vue";
+
+const modelValue = defineModel({
+  type: String,
+  default: "",
+});
+
+function chooseImage() {
+  uni.chooseImage({
+    count: 1, //默认9
+    sizeType: ["original", "compressed"], //可以指定是原图还是压缩图，默认二者都有
+    sourceType: ["album", "camera "],
+    success: async function (res) {
+      uni.showLoading({
+        title: "上传中",
+      });
+      console.log(res);
+      const fileRes = await uploadFile(res.tempFiles[0]);
+      uni.hideLoading();
+      if (fileRes) {
+        modelValue.value = fileRes;
+      } else {
+        uni.showToast({
+          title: "上传失败",
+          icon: "none",
+        });
+      }
+    },
+  });
+}
+
+function clearImg(){
+	modelValue.value=""
+}
+</script>
+
+<style lang="scss">
+.upload-file {
+  $size: 128rpx;
+  width: $size;
+  height: $size;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  border: 1px dashed #d9d9d9;
+  border-radius: 8rpx;
+  position: relative;
+  .close{
+	position: absolute;
+	right: -10rpx;
+	top: -10rpx;
+  }
+  .img {
+    width: $size;
+    height: $size;
+  }
+  .icon {
+    width: 36rpx;
+    height: 36rpx;
+    border: 4rpx solid #999;
+    border-radius: 8rpx;
+    font-weight: 700;
+    color: #999;
+    font-size: 32rpx;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    line-height: 1;
+    padding: 0;
+    margin: 0;
+    text-align: center;
+  }
+}
+</style>
diff --git a/http/api/market/member.js b/http/api/market/member.js
new file mode 100644
index 0000000..6850b49
--- /dev/null
+++ b/http/api/market/member.js
@@ -0,0 +1,67 @@
+import http from '@/http/http.js'
+const request = http.request
+const urlType='market'
+
+export function getConfig(data) {
+    return request({
+        url: `${urlType}/admin/member`,
+        method: "GET",
+        data: {
+            ...data
+        }
+    })
+}
+
+
+export function editConfig(data) {
+    return request({
+        url: `${urlType}/admin/member`,
+        method: "POST",
+        data: {
+            ...data
+        }
+    })
+}
+
+export function levelList(data) {
+    return request({
+        url: `${urlType}/admin/member/level/list`,
+        method: "GET",
+        data: {
+            ...data
+        }
+    })
+}
+export function orderList(data) {
+    return request({
+        url: `${urlType}/admin/member/order`,
+        method: "GET",
+        data: {
+            ...data
+        }
+    })
+}
+export function levelAdd(data) {
+    return request({
+        url: `${urlType}/admin/member/level`,
+        method: "POST",
+        data: {
+            ...data
+        }
+    })
+}
+export function levelEdit(data) {
+    return request({
+        url: `${urlType}/admin/member/level`,
+        method: "PUT",
+        data: {
+            ...data
+        }
+    })
+}
+export function levelDel(id) {
+    return request({
+        url: `${urlType}/admin/member/level/${id}`,
+        method: "DELETE",
+    })
+}
diff --git a/pageBwc/index/index.vue b/pageBwc/index/index.vue
index ae13880..d61f3f4 100644
--- a/pageBwc/index/index.vue
+++ b/pageBwc/index/index.vue
@@ -10,6 +10,7 @@
 				<up-switch v-model="form.enable" size="18" 
         :active-value="1"
         :inactive-value="0"
+        :disabled="isMainShop()?false:true"
         ></up-switch>
 			</view>
 		</view>
@@ -83,7 +84,7 @@
 			</view>
 		</view>
 
-		<my-bottom-btn-group @cancel="cancel" @save="editFreeDing"></my-bottom-btn-group>
+		<my-bottom-btn-group  @cancel="cancel" @save="editFreeDing" isOpenPermission></my-bottom-btn-group>
 
 
 	</view>
@@ -92,7 +93,7 @@
 <script setup>
 import { onShow, onLoad } from "@dcloudio/uni-app";
 import { reactive, ref, watch } from "vue";
-
+import { isMainShop } from "@/store/account";
 import { getFreeDing, updateFreeDing } from "@/http/api/freeDing.js";
 const form = reactive({
   rechargeTimes: 2,
diff --git a/pageChat/index.vue b/pageChat/index.vue
new file mode 100644
index 0000000..99bfd3b
--- /dev/null
+++ b/pageChat/index.vue
@@ -0,0 +1,3 @@
+<template>
+    <view></view>
+</template>
\ No newline at end of file
diff --git a/pageMarket/consumeCashback/components/config.vue b/pageMarket/consumeCashback/components/config.vue
index 338a479..25f6837 100644
--- a/pageMarket/consumeCashback/components/config.vue
+++ b/pageMarket/consumeCashback/components/config.vue
@@ -14,6 +14,7 @@
         </view>
         <up-switch
           v-model="form.isEnable"
+          :disabled="isMainShop()?false:true"
           size="18"
           :active-value="1"
           :inactive-value="0"
@@ -99,7 +100,7 @@
 
       <button class="add u-m-t-32" @click="addcashbackStepList">添加</button>
     </view>
-    <my-bottom-btn-group @save="save" @cancel="cancel"></my-bottom-btn-group>
+    <my-bottom-btn-group @save="save" isOpenPermission @cancel="cancel"></my-bottom-btn-group>
   </view>
 </template>
   
@@ -107,6 +108,7 @@
 import { reactive, computed, onMounted } from "vue";
 import userTypes from "./user-types.vue";
 import * as consumeCashbackApi from "@/http/api/market/consumeCashback.js";
+import { isMainShop } from "@/store/account";
 import {
   onLoad,
   onReady,
diff --git a/pageMarket/consumeCashback/index.vue b/pageMarket/consumeCashback/index.vue
index d423089..0a7b6b9 100644
--- a/pageMarket/consumeCashback/index.vue
+++ b/pageMarket/consumeCashback/index.vue
@@ -10,6 +10,7 @@
 					</view>
 					<view class="u-flex-1 u-p-l-16">
 						<up-search bgColor="#F9F9F9" height="60rpx" :showAction="false" placeholder="搜索订单号"
+						
 							@search="search" @clear="search" v-model="searchText"></up-search>
 					</view>
 				</view>
@@ -22,7 +23,7 @@
 					<view class="color-999 u-font-24">
 						<view> 关联订单:{{ item.orderNo }} </view>
 						<view class="u-m-t-14">
-							<text class="color-333 font-bold"> {{ item.shopName }}</text>
+							<text class="color-333 font-bold u-m-r-20"> {{ item.shopName }}</text>
 							<text class="color-666 u-font-24">{{ item.createTime }}</text>
 						</view>
 					</view>
@@ -33,8 +34,8 @@
 				</view>
 				<view class="color-333 u-flex u-row-between u-font-28" style="margin-top: 52rpx">
 					<view>
-						<view class="color-666">用户昵称</view>
-						<view class="color-333 u-m-t-24 u-line-1">{{ item.nickName }}</view>
+						<view class="color-666">{{ item.nickName }}</view>
+						<view class="color-333 u-m-t-24 u-line-1">{{ item.phone }}</view>
 					</view>
 					<view class="u-flex u-text-center">
 						<view>
@@ -69,6 +70,7 @@
 		onReachBottom,
 		onBackPress,
 	} from "@dcloudio/uni-app";
+	import { isMainShop } from "@/store/account.js";
 	import {
 		ref,
 		onMounted,
diff --git a/pageMarket/couponExchangeCode/detail.vue b/pageMarket/couponExchangeCode/detail.vue
index 9864a77..1ce7a73 100644
--- a/pageMarket/couponExchangeCode/detail.vue
+++ b/pageMarket/couponExchangeCode/detail.vue
@@ -45,7 +45,7 @@
       <view class="u-p-b-24"></view>
     </view>
     <view class="u-p-t-48 u-p-b-48 u-p-l-60 u-p-r-60">
-      <my-button type="primary" shape="circle" @click="save">保存</my-button>
+      <my-button type="primary" shape="circle" @click="save" v-if="isMainShop()">保存</my-button>
     </view>
 
     <view class="bg-fff default-box-radius">
@@ -131,7 +131,7 @@ import {
 import couponStatus from "./components/status.vue";
 import CouponList from "@/pageMarket/components/coupon-list.vue";
 import DateTimePicker from "@/pageMarket/components/date-time-picker.vue";
-
+import {isMainShop} from "@/store/account.js";
 import Modal from "@/pageMarket/components/modal.vue";
 import * as couponRedemptionApi from "@/http/api/market/couponRedemption.js";
 import { saveFileFromTemp } from "@/utils/downloadFile.js";
diff --git a/pageMarket/couponExchangeCode/index.vue b/pageMarket/couponExchangeCode/index.vue
index bc4928d..a8e52dd 100644
--- a/pageMarket/couponExchangeCode/index.vue
+++ b/pageMarket/couponExchangeCode/index.vue
@@ -16,6 +16,8 @@
             </view>
             <up-switch
               v-model="accountInfoStore.shopInfo.isProductSuggest"
+              :disabled="isMainShop()?false:true"
+
               size="18"
               :active-value="1"
               :inactive-value="0"
@@ -68,12 +70,14 @@
         </view> -->
       </view>
     </view>
-    <view style="height: 100rpx"></view>
-    <view class="fixed-bottom">
-      <my-button @click="go.to('PAGES_MARKET_COUPON_EXCHANGE_CODE_ADD')"
-        >添加兑换码</my-button
-      >
-    </view>
+    <template v-if="isMainShop()">
+      <view style="height: 100rpx"></view>
+      <view class="fixed-bottom">
+        <my-button @click="go.to('PAGES_MARKET_COUPON_EXCHANGE_CODE_ADD')"
+          >添加兑换码</my-button
+        >
+      </view>
+    </template>
 
     <Modal
       v-model="modalData.show"
@@ -116,13 +120,14 @@ import Modal from "@/pageMarket/components/modal.vue";
 import * as couponRedemptionApi from "@/http/api/market/couponRedemption.js";
 import { useAccountInfoStore } from "@/store/account.js";
 import go from "@/commons/utils/go.js";
+import { isMainShop } from "@/store/account.js";
 const accountInfoStore = useAccountInfoStore();
 import { ref, reactive, onMounted, computed, watch } from "vue";
 const loadFinish = ref(false);
 const form = reactive({
   isEnable: 0,
   useType: "all",
-  shopIdList:[]
+  shopIdList: [],
 });
 
 const actions = [
@@ -223,7 +228,7 @@ const handleConfirm = async () => {
   }
 
   couponRedemptionApi.enable({
-    shopIdList: form.shopIdList||[],
+    shopIdList: form.shopIdList || [],
     useType: form.useType,
     isEnable: form.isEnable,
   });
@@ -261,6 +266,7 @@ function getShopInfo() {
 watch(
   () => accountInfoStore.shopInfo.isProductSuggest,
   (newVal, oldVal) => {
+    if(!isMainShop()) return;
     if (!loadFinish.value) return;
     accountInfoStore.editShopInfo({
       isProductSuggest: newVal,
diff --git a/pageMarket/distribution/components/config.vue b/pageMarket/distribution/components/config.vue
index ba6ba35..35189bd 100644
--- a/pageMarket/distribution/components/config.vue
+++ b/pageMarket/distribution/components/config.vue
@@ -264,7 +264,10 @@ function setForm(data) {
   console.log(form);
 }
 
-onMounted(() => {});
+onMounted(() => {
+  setForm(distributionStore.config);
+
+});
 </script>
 
 <style lang="scss" scoped>
diff --git a/pageMarket/distribution/level-list.vue b/pageMarket/distribution/level-list.vue
index 3c47c5b..07e0768 100644
--- a/pageMarket/distribution/level-list.vue
+++ b/pageMarket/distribution/level-list.vue
@@ -57,6 +57,9 @@
         <view class="u-m-t-16 u-p-b-8">
             <view class="u-flex u-m-t-16">
             <input
+              :disabled="index==0?true:false"
+              :class="{'disabled':index==0?true:false}"
+
               class="number-box"
               placeholder="请输入"
               placeholder-class="color-999 u-font-28"
@@ -76,6 +79,8 @@
             <view class="u-flex u-m-t-16">
             <input
               class="number-box"
+              :disabled="index==0?true:false"
+              :class="{'disabled':index==0?true:false}"
               placeholder="请输入"
               placeholder-class="color-999 u-font-28"
               type="digit"
@@ -275,8 +280,8 @@ onLoad(()=>{
     form.levelConfigList=levelConfigList.length?levelConfigList:[
     {   name:'',
         levelOneCommission:'',
-        inviteCount:'',
-        costAmount:''}
+        inviteCount:0,
+        costAmount:0}
     ]
     form.upgradeType=distributionStore.config.upgradeType
 })
@@ -309,6 +314,10 @@ $height: 70rpx;
   height: $height;
   flex: 1;
   line-height: $height;
+  &.disabled{
+    background-color: #f7f7fa;
+    color: #999999;
+  }
 }
 .unit {
   display: flex;
diff --git a/pageMarket/limitDiscount/index.vue b/pageMarket/limitDiscount/index.vue
index 80a18c6..a995d7e 100644
--- a/pageMarket/limitDiscount/index.vue
+++ b/pageMarket/limitDiscount/index.vue
@@ -28,7 +28,7 @@
 					</text>
 					<text class="t">折扣：{{ item.discountRate }}%</text>
 				</view>
-				<view class="footer">
+				<view class="footer" v-if="isMainShop()">
 					<view class="btn">
 						<u-button shape="circle" @click="delHandle(item)">删除</u-button>
 					</view>
@@ -39,7 +39,7 @@
 			</view>
 		</view>
 		<u-loadmore :status="tableData.status"></u-loadmore>
-		<my-footer-btn @confirm="go.to('PAGES_LIMIT_DISCOUNT_ADD')"></my-footer-btn>
+		<my-footer-btn confirmText="添加" @confirm="go.to('PAGES_LIMIT_DISCOUNT_ADD')"></my-footer-btn>
 	</view>
 </template>
 
@@ -49,7 +49,7 @@ import { onLoad, onShow, onReachBottom } from '@dcloudio/uni-app';
 import { limitTimeDiscountPage, limitTimeDiscountDel } from '@/http/api/market/index.js';
 import go from '@/commons/utils/go.js';
 import { convertTimeFormat } from '@/utils/index.js';
-
+import {isMainShop} from "@/store/account.js";
 // 去编辑
 function editorHandle(item) {
 	uni.setStorageSync('limitDiscountObj', item);
diff --git a/pageMarket/newUserDiscount/index.vue b/pageMarket/newUserDiscount/index.vue
index 8f0bb2b..08303f3 100644
--- a/pageMarket/newUserDiscount/index.vue
+++ b/pageMarket/newUserDiscount/index.vue
@@ -190,7 +190,7 @@ function addItem() {
 }
 function editItem(index) {
   modalData.index = index;
-  modalData.form = form.randomDiscountList[index];
+  modalData.form = {...form.randomDiscountList[index]}
   modalData.show = true;
   modalData.key = "edit";
   modalData.title = "编辑方案";
diff --git a/pageMarket/orderRecommendation/index.vue b/pageMarket/orderRecommendation/index.vue
index 0097c7d..1546ec3 100644
--- a/pageMarket/orderRecommendation/index.vue
+++ b/pageMarket/orderRecommendation/index.vue
@@ -230,7 +230,6 @@ onReachBottom(() => {
   getList();
 });
 onMounted(() => {
-  getList();
   getShopInfo();
 });
 onShow(() => {
diff --git a/pageMarket/rechargeExchangeCode/detail.vue b/pageMarket/rechargeExchangeCode/detail.vue
index 53c9cb3..fc0b87a 100644
--- a/pageMarket/rechargeExchangeCode/detail.vue
+++ b/pageMarket/rechargeExchangeCode/detail.vue
@@ -38,7 +38,7 @@
       </view>
   
     </view>
-    <view class="u-p-t-48 u-p-b-48 u-p-l-60 u-p-r-60">
+    <view class="u-p-t-48 u-p-b-48 u-p-l-60 u-p-r-60" v-if="isMainShop()">
       <my-button type="primary" shape="circle" @click="save">保存</my-button>
     </view>
 
@@ -124,7 +124,7 @@ import {
 } from "@dcloudio/uni-app";
 import couponStatus from "./components/status.vue";
 import CouponList from "@/pageMarket/components/coupon-list.vue";
-
+import {isMainShop} from "@/store/account.js";
 import Modal from "@/pageMarket/components/modal.vue";
 import * as rechargeRedemptionApi from "@/http/api/market/rechargeRedemption.js";
 import { saveFileFromTemp } from "@/utils/downloadFile.js";
diff --git a/pageMarket/rechargeExchangeCode/index.vue b/pageMarket/rechargeExchangeCode/index.vue
index 32826c5..5179f15 100644
--- a/pageMarket/rechargeExchangeCode/index.vue
+++ b/pageMarket/rechargeExchangeCode/index.vue
@@ -17,6 +17,7 @@
             <up-switch
               v-model="accountInfoStore.shopInfo.isProductSuggest"
               size="18"
+              :disabled="isMainShop()?false:true"
               :active-value="1"
               :inactive-value="0"
             ></up-switch>
@@ -81,12 +82,15 @@
         </view> -->
       </view>
     </view>
-    <view style="height: 100rpx"></view>
+    <template v-if="isMainShop()">
+      <view style="height: 100rpx"></view>
     <view class="fixed-bottom">
       <my-button @click="go.to('PAGES_MARKET_RECHARGE_EXCHANGE_CODE_ADD')"
         >添加兑换码</my-button
       >
     </view>
+    </template>
+
 
     <Modal
       v-model="modalData.show"
@@ -129,6 +133,7 @@ import Modal from "@/pageMarket/components/modal.vue";
 import * as rechargeRedemptionApi from "@/http/api/market/rechargeRedemption.js";
 import { useAccountInfoStore } from "@/store/account.js";
 import go from "@/commons/utils/go.js";
+import {isMainShop} from "@/store/account.js";
 const accountInfoStore = useAccountInfoStore();
 import { ref, reactive, onMounted, computed, watch } from "vue";
 const loadFinish = ref(false);
@@ -274,6 +279,7 @@ function getShopInfo() {
 watch(
   () => accountInfoStore.shopInfo.isProductSuggest,
   (newVal, oldVal) => {
+    if(!isMainShop()) return;
     if (!loadFinish.value) return;
     accountInfoStore.editShopInfo({
       isProductSuggest: newVal,
diff --git a/pageMarket/static/images/member.png b/pageMarket/static/images/member.png
new file mode 100644
index 0000000000000000000000000000000000000000..779580f227229efacd274aaabe606b9bfa357254
GIT binary patch
literal 936
zcmV;Z16TZsP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F8000ABNkl<Zcmc$g
zSx6O89L9flY{m8>gNlmwJzB`3FrkGOvrG%ugp7oGuqS;8>Lu_c2<jn7EriHOQPYq}
zuqVrhBq+;@B50u%%G}Cj`u}IJ>)c%KT=h20cjlZkXTI+{XU_SbV<6Y&Jab7zo>?Yn
z6qrMd=7?OgIP$8wRHQLfTwL6j!X81WV5slWc-Yt3Nwu0V43o2>I8G4kdz_faHpI=2
zU@Ldii!`J#TJXQ_P&Lq}c!&p*S3=<-s5}f8cSGbH(E2_<^z&uE2GZBTk<}1796mL|
zvZ-)-3*;Yw*d;J(n4e0$H0#sA+({54BHvpfwHOkMAiWIky@6?C;KX_;h=XHmVZx|h
z6#A*|(?CYJJ=D3i()%Wxss1aRse%+SQ}h&T1mc&&&4ZA+31*JB+xeUJXkd5<L@$En
zVes|`)PBI~vG%$P9j1uZK}H3XJ-6j{&X-@aAF{W>s%co?gh^ykKD))gsl$LytfOm$
zFab_(up4WSuEk;vwGOv0E=57qLg*6lcp!WRoZo4Gb3;bvRy?E$ukzch-qi4BWwx(^
z#1+uq2@l>44r+wwR|h1mfCNEzJ<U4|XiwUtaat*4-5nfc3eWL!P~MouD(Qs7z+?$Y
z-&)|KEH`JfftB9>1m&G5{Ju;M1HLbVQFdiOXL)%d%$wx2wr~oR%EaBhz*+B4$&~>m
z95VuvR%*_R6e*7%X-{5nt$#UJ1}a~}7YRravtafFTVVQF2%l-!SH80A+@!7y=u9qn
z0=m}Ytn&;c%hJ{Ltx-{f6D}`T29*2u3uyce+vmd4sjy9+x>uCc>s$A5ZJ@Os3MB+<
z<jdZQwJn!C1Fd&253UWUNTF;(DmYdqo<0NZy>bO)Kz~8SOZ{AypA5bJ0=wis4ak7X
z<UE86HIV;EOMxR`15It9Ghd(n$a{Ke<S?LnK$z^`izKr3(mtSSjg(V_SNVMj90smG
z##-Zg@VvYibgv&Ma-!uRy9;Zz6bL^)m%~7*OsI3!SclK~lR-yfpwNBeb2BJ!Ppd@@
zNO1Mq(&LpLKDS(f!9rpoe~)cmB`epW2IPoo6@s6b+%XJ;EKzO{1p96<LO5kqrF!bb
z#70a?067myI*4}<RQk)yRa3S900030{~pQwa{vGU21!IgR09B~1$3!|OfQE30000<
KMNUMnLSTYglC~BA

literal 0
HcmV?d00001

diff --git a/pageMarket/superVip/add-plans.vue b/pageMarket/superVip/add-plans.vue
new file mode 100644
index 0000000..4c3ea7e
--- /dev/null
+++ b/pageMarket/superVip/add-plans.vue
@@ -0,0 +1,287 @@
+<template>
+  <view class="min-page u-font-28 color-333">
+    <view class="container">
+      <view class="">
+        <view class="font-bold u-m-b-16">周期名称</view>
+        <up-input
+          v-model="form.name"
+          placeholder="请输入周期名称"
+          :placeholderStyle="placeholderStyle"
+        ></up-input>
+      </view>
+      <view class="u-m-t-32">
+        <view class="font-bold u-m-b-16">周期价格</view>
+        <view class="u-flex">
+          <input class="number-box" type="digit" v-model="form.price" />
+          <view class="unit">元</view>
+        </view>
+      </view>
+      <view class="u-m-t-32">
+        <view class="font-bold u-m-b-16">周期时间</view>
+        <view class="u-flex" style="gap: 24rpx; align-items: stretch">
+          <up-input type="digit" v-model="form.circleTime"></up-input>
+          <view class="times">
+            <up-select
+              v-model:current="form.circleUnit"
+              showOptionsLabel
+              label="单位"
+              keyName="value"
+              labelName="label"
+              :options="times"
+              @select="selectItem"
+            ></up-select>
+          </view>
+        </view>
+      </view>
+      <view class="u-m-t-32">
+        <view class="font-bold u-m-b-16">赠送成长值</view>
+        <up-input
+          type="number"
+          v-model="form.reward"
+          placeholder="赠送成长值"
+          :placeholderStyle="placeholderStyle"
+        ></up-input>
+      </view>
+    </view>
+
+    <view class="container">
+      <view class="font-bold u-m-b-16">赠送优惠券</view>
+      <CouponList v-model="form.couponList"></CouponList>
+      <view class="u-flex">
+        <view class="u-flex gap-20" @click="addCoupon()">
+          <up-icon name="plus-circle-fill" color="#318AFE" size="16"></up-icon>
+          <text class="">添加</text>
+        </view>
+      </view>
+    </view>
+
+    <my-bottom-btn-group @save="save" @cancel="cancel"></my-bottom-btn-group>
+  </view>
+</template>
+<script setup>
+import {
+  onLoad,
+  onReady,
+  onShow,
+  onPageScroll,
+  onReachBottom,
+  onBackPress,
+} from "@dcloudio/uni-app";
+import CouponList from "./components/coupon-list.vue";
+import { ref, onMounted, watch, reactive, computed } from "vue";
+import { useSuperVipStore } from "@/store/market.js";
+import { add } from "lodash";
+const times = [
+  {
+    label: "年",
+    value: "年",
+  },
+  {
+    label: "月",
+    value: "月",
+  },
+  {
+    label: "周",
+    value: "周",
+  },
+  {
+    label: "天",
+    value: "天",
+  },
+];
+const placeholderStyle = {
+  "font-size": "28rpx",
+};
+const superVipStore = useSuperVipStore();
+
+const form = reactive({
+  name: "",
+  price: 0,
+  reward: 0,
+  couponList: [], // 存储已选择的优惠券
+  circleTime: 1, // 会员周期
+  circleUnit: "月", // 会员周期单位
+});
+function addCoupon() {
+  form.couponList.push({
+    coupon: { id: null },
+    num: "",
+    title: "",
+  });
+}
+const showDetailListSwitch = ref([true]);
+
+//判断输入每一项是否为空
+function checkInput() {
+  for (let item of form.couponList) {
+    if (!item.coupon.id) {
+      uni.showToast({
+        title: "请选择优惠券",
+        icon: "none",
+      });
+      return false;
+    }
+    if (!item.num) {
+      uni.showToast({
+        title: "请输入优惠券数量",
+        icon: "none",
+      });
+      return false;
+    }
+  }
+  return true;
+}
+async function save() {
+  const isPas = checkInput();
+  if (!isPas) {
+    return;
+  }
+  if (!form.name) {
+    uni.showToast({
+      title: "请输入周期名称",
+      icon: "none",
+    });
+    return false;
+  }
+  if (!form.price) {
+    uni.showToast({
+      title: "请输入周期价格",
+      icon: "none",
+    });
+    return false;
+  }
+  if (!form.circleTime) {
+    uni.showToast({
+      title: "请输入周期时间",
+      icon: "none",
+    });
+    return false;
+  }
+
+  if (optiopns.type == "edit") {
+    superVipStore.editPlan(optiopns.index, form);
+  } else {
+    superVipStore.addPlan(form);
+  }
+  const res = await superVipStore.editConfig();
+  if (res) {
+    uni.showToast({
+      title: "保存成功",
+      icon: "none",
+    });
+  }else{
+      uni.showToast({
+        title: "保存失败",
+        icon: "none",
+      });
+      return 
+  }
+  setTimeout(() => {
+    uni.navigateBack({
+      delta: 1,
+    });
+  }, 1500);
+}
+function cancel() {
+  uni.navigateBack({
+    delta: 1,
+  });
+}
+const optiopns = reactive({});
+onLoad((opt) => {
+  Object.assign(optiopns, opt);
+  if (opt.type === "edit" && opt.index !== undefined && opt.index !== null) {
+    const item = superVipStore.config.configList[opt.index];
+    Object.assign(form, item);
+  }
+});
+</script>
+<style lang="scss" scoped>
+.min-page {
+  background: #f7f7f7;
+  padding: 56rpx 28rpx;
+}
+.container {
+  background: #fff;
+  padding: 32rpx 24rpx;
+  margin-top: 32rpx;
+  border-radius: 16rpx;
+}
+.x-padding {
+  padding: 0 24rpx;
+}
+$height: 70rpx;
+.number-box {
+  font-size: 28rpx;
+  padding: 0 26rpx;
+  border-radius: 6rpx 0 0 6rpx;
+  border-top: 2rpx solid #d9d9d9;
+  border-bottom: 2rpx solid #d9d9d9;
+  border-left: 2rpx solid #d9d9d9;
+  background: #fff;
+  box-sizing: border-box;
+  height: $height;
+  flex: 1;
+  line-height: $height;
+  &.disabled {
+    background-color: #f7f7fa;
+    color: #999999;
+  }
+}
+.unit {
+  display: flex;
+  padding: 0 38rpx;
+  height: $height;
+  line-height: $height;
+  align-items: center;
+  border-radius: 0 6rpx 6rpx 0;
+  border: 2rpx solid #d9d9d9;
+  background: #f7f7fa;
+  font-size: 28rpx;
+  color: #999999;
+}
+
+.my-btn {
+  font-size: 28rpx;
+  line-height: 36rpx;
+  padding: 8rpx 32rpx;
+  border-radius: 12rpx;
+  margin: 0;
+}
+
+.edit-btn {
+  background: #e6f0ff;
+  color: $my-main-color;
+}
+
+.delete-btn {
+  background: #ffe7e6;
+  color: #ff1c1c;
+}
+.title {
+  font-weight: 700;
+  color: #333;
+  font-size: 28rpx;
+}
+.first {
+  border-bottom: 2rpx solid #e5e5e5;
+}
+.arrow {
+  transition: all 0.3s ease-in-out;
+  &.rotate {
+    transform: rotate(180deg);
+  }
+}
+.times {
+  padding: 10rpx 20rpx;
+  border: 1px solid #d9d9d9;
+  border-radius: 8rpx;
+  display: flex;
+  align-content: center;
+  justify-content: center;
+  flex-direction: column;
+}
+:deep(.times .u-select) {
+  display: flex;
+}
+</style>
diff --git a/pageMarket/superVip/components/config.vue b/pageMarket/superVip/components/config.vue
new file mode 100644
index 0000000..9f785d4
--- /dev/null
+++ b/pageMarket/superVip/components/config.vue
@@ -0,0 +1,336 @@
+<template>
+  <view class="box">
+    <view class="u-m-t-32 container" style="padding-left: 0; padding-right: 0">
+      <view class="x-padding">
+        <view class="u-flex u-row-between custome">
+          <text class="font-bold color-333">提交生日/姓名</text>
+          <up-radio-group v-model="form.isSubmitInfo" placement="row">
+            <up-radio :key="1" :name="1">
+              <template #label>
+                <text> 是 </text>
+              </template>
+            </up-radio>
+            <up-radio :key="0" :name="0">
+              <template #label>
+                <text> 否 </text>
+              </template>
+            </up-radio>
+          </up-radio-group>
+        </view>
+        <view class="color-999 u-font-24 u-m-t-10"
+          >*成为会员前需提交生日、姓名、性别信息</view
+        >
+      </view>
+    </view>
+
+    <view class="u-m-t-32 container" style="padding-left: 0; padding-right: 0">
+      <view class="x-padding">
+        <view class="u-flex u-row-between custome">
+          <text class="font-bold color-333">会员开通方式</text>
+          <up-radio-group v-model="form.openType" placement="row">
+            <up-radio key="PAY" name="PAY">
+              <template #label>
+                <text> 购买开通 </text>
+              </template>
+            </up-radio>
+            <up-radio key="CONDITION" name="CONDITION">
+              <template #label>
+                <text> 条件开通 </text>
+              </template>
+            </up-radio>
+          </up-radio-group>
+        </view>
+        <view class="u-m-t-24">
+          <up-line></up-line>
+        </view>
+        <template v-if="form.openType == 'PAY'">
+          <view
+            class="u-flex u-row-between u-p-t-26"
+            @click="go.to('PAGES_MARKET_SUPER_VIP_VIP_PLANS')"
+          >
+            <text class="font-bold color-333">会员周期列表</text>
+            <view class="u-flex">
+              <text class="u-font-24 color-main">去设置</text>
+              <up-icon name="arrow-right" color="#318AFE"></up-icon>
+            </view>
+          </view>
+        </template>
+        <template v-if="form.openType == 'CONDITION'">
+          <view class="u-flex u-row-between u-col-baseline u-m-t-32">
+            <text class="font-bold color-333">成为会员条件</text>
+            <view class="u-flex-1 u-p-l-32">
+              <view v-for="(item, index) in conditionLists" :key="index">
+                <up-checkbox usedAlone v-model:checked="item.checked">
+                  <template #label>
+                    <view> {{ item.label }} </view>
+                  </template>
+                </up-checkbox>
+                <view class="u-m-t-24 u-m-b-24">
+                  <up-number-box
+                    :inputWidth="100"
+                    :decimalLength="item.precision || 0"
+                    v-if="item.label != '绑定手机号' && item.checked"
+                    v-model="item.value"
+                    :step="item.step"
+                    :min="item.min || 0"
+                  ></up-number-box>
+                </view>
+              </view>
+            </view>
+          </view>
+        </template>
+      </view>
+    </view>
+    <view class="u-m-t-32 container">
+      <view class="font-bold color-333 u-m-b-16">可用门店</view>
+      <my-shop-select
+        @shop-select="shopSelect"
+        v-model:selShops="form.memberPriceShopIdList"
+        v-model:useType="form.memberPriceShopType"
+      ></my-shop-select>
+    </view>
+
+    <view class="u-m-t-32 container">
+      <view class="font-bold color-333 u-m-b-16">规则说明</view>
+      <up-textarea
+        v-model="form.remark"
+        placeholder="请输入规则说明"
+      ></up-textarea>
+    </view>
+
+    <view class="u-m-t-32 container">
+      <view class="font-bold color-333">获取成长值升级</view>
+      <view class="u-m-t-6 color-999 u-font-24"
+        >*两个条件必选有一条是大于0的数值</view
+      >
+      <view class="u-flex u-m-t-26 gap-20">
+        <text>每消费1元获得成长值</text>
+        <up-number-box
+          v-model="form.costReward"
+          inputWidth="80"
+          placeholder="请输入内容"
+        ></up-number-box>
+      </view>
+      <view class="u-flex u-m-t-26 gap-20">
+        <text>每充值1元获得成长值</text>
+        <up-number-box
+          v-model="form.rechargeReward"
+          inputWidth="80"
+          placeholder="请输入内容"
+        ></up-number-box>
+      </view>
+    </view>
+    <my-bottom-btn-group @save="save" @cancel="cancel"></my-bottom-btn-group>
+  </view>
+</template>
+
+<script setup>
+import { reactive, computed, onMounted, ref, inject, watch } from "vue";
+import userTypes from "./user-types.vue";
+import {
+  onLoad,
+  onReady,
+  onShow,
+  onPageScroll,
+  onReachBottom,
+  onBackPress,
+} from "@dcloudio/uni-app";
+import go from "@/commons/utils/go.js";
+
+const conditionLists = ref([
+  { label: "绑定手机号", checked: false, code: "BIND_PHONE" },
+  {
+    label: "订单达成指定次数",
+    checked: false,
+    value: "",
+    code: "ORDER",
+    step: 1,
+    stepStrictly: true,
+    min: 1,
+  },
+  {
+    label: "消费达到指定金额",
+    checked: false,
+    value: "",
+    code: "COST_AMOUNT",
+    precision: 2,
+    min: 0.01,
+  },
+  {
+    label: "充值达到指定金额",
+    checked: false,
+    value: "",
+    code: "RECHARGE_AMOUNT",
+    precision: 2,
+    min: 0.01,
+  },
+]);
+
+const superVipStore = inject("superVipStore");
+
+//分销奖励次数
+const isLimitCount = ref(0);
+const isLimitCounts = [
+  {
+    value: 0,
+    label: "限制",
+  },
+  {
+    value: 1,
+    label: "不限制",
+  },
+];
+//开通方式
+const opentypes = [
+  {
+    value: "auto",
+    label: "自动开通",
+  },
+  {
+    value: "manual",
+    label: "手动开通",
+  },
+  {
+    value: "pay",
+    label: "付费开通",
+  },
+];
+const form = reactive({
+  isSubmitInfo: 1,
+  openType: "PAY",
+  configList: [],
+  memberPriceShopType: "ALL",
+  remark: "",
+  costReward: 0,
+  rechargeReward: 0,
+  memberPriceShopIdList: [],
+  isMemberPrice: 1,
+  isOpen: 0,
+});
+watch(
+  () => isLimitCount.value,
+  (newval) => {
+    if (newval) {
+      form.rewardCount = -1;
+    } else {
+      form.rewardCount = "";
+    }
+  }
+);
+
+async function save() {
+  console.log(form);
+  const submitData = {
+    ...form,
+  };
+  const res = await superVipStore.editConfig(submitData);
+  uni.showToast({
+    title: "更新成功",
+    icon: "none",
+    duration: 2000,
+  });
+}
+function cancel() {
+  uni.navigateBack();
+}
+watch(
+  () => superVipStore.config,
+  (newval) => {
+    setForm(newval);
+  }
+);
+
+function setForm(data) {
+  if (data.rewardCount == -1) {
+    isLimitCount.value = 1;
+  }
+  Object.assign(form, data);
+  console.log(form);
+}
+
+onMounted(() => {
+  setForm(superVipStore.config);
+});
+</script>
+
+<style lang="scss" scoped>
+.x-padding {
+  padding: 0 24rpx;
+}
+.text-tips {
+  color: #999999;
+  font-size: 14px;
+  padding: 0 28rpx;
+  border-radius: 6rpx 0 0 6rpx;
+  border: 2rpx solid #d9d9d9;
+  background-color: #f7f7fa;
+  line-height: 60rpx;
+}
+.text-tips1 {
+  border-radius: 0 6rpx 6rpx 0;
+}
+.gap-40 {
+  gap: 40rpx;
+}
+.my-input {
+  border: 2rpx solid #d9d9d9;
+  height: 60rpx;
+  border-right: none;
+  width: 240rpx;
+  text-align: center;
+  padding: 0 2px;
+  font-size: 14px;
+}
+.box {
+  padding: 0 28rpx;
+  font-size: 28rpx;
+}
+.container {
+  background: #fff;
+  padding: 32rpx 24rpx;
+  margin-top: 32rpx;
+  border-radius: 16rpx;
+  overflow: hidden;
+}
+.add {
+  padding: 8rpx 32rpx;
+  border-radius: 12rpx;
+  background: #318afe;
+  color: #ffffff;
+  font-size: 28rpx;
+  line-height: 56rpx;
+  margin: 0;
+}
+.color-red {
+  color: #ff2f2f;
+}
+$height: 70rpx;
+.number-box {
+  font-size: 28rpx;
+  padding: 0 26rpx;
+  border-radius: 6rpx 0 0 6rpx;
+  border-top: 2rpx solid #d9d9d9;
+  border-bottom: 2rpx solid #d9d9d9;
+  border-left: 2rpx solid #d9d9d9;
+  background: #fff;
+  box-sizing: border-box;
+  height: $height;
+  flex: 1;
+  line-height: $height;
+}
+.unit {
+  display: flex;
+  padding: 0 38rpx;
+  height: $height;
+  line-height: $height;
+  align-items: center;
+  border-radius: 0 6rpx 6rpx 0;
+  border: 2rpx solid #d9d9d9;
+  background: #f7f7fa;
+  font-size: 28rpx;
+  color: #999999;
+}
+:deep(.custome .u-radio-group) {
+  justify-content: flex-end;
+}
+</style>
diff --git a/pageMarket/superVip/components/coupon-list.vue b/pageMarket/superVip/components/coupon-list.vue
new file mode 100644
index 0000000..076c3c1
--- /dev/null
+++ b/pageMarket/superVip/components/coupon-list.vue
@@ -0,0 +1,110 @@
+<template>
+  <view>
+    <view
+      class="u-flex u-row-between u-m-b-24"
+      style="gap: 40rpx"
+      v-for="(item, index) in modelValue"
+      :key="index"
+    >
+      <view
+        class="choose-coupon u-flex-1 u-flex u-row-between"
+        @click="showCoupon(item, index)"
+      >
+        <template v-if="item.coupon.title">
+          <text>{{ item.coupon.title }}</text>
+          <view class="u-flex" @click.stop="clearCoupon(index)">
+            <up-icon name="close" size="14"></up-icon>
+          </view>
+        </template>
+
+        <template v-else>
+          <text class="color-999">选择赠送券</text>
+          <up-icon name="arrow-down" size="14"></up-icon>
+        </template>
+      </view>
+      <view class="u-flex-1 u-flex">
+        <view class="u-flex-1 input-number-box u-flex">
+          <input
+            class="u-flex-1 input"
+            type="number"
+            v-model="item.num"
+            placeholder=""
+            placeholder-class="color-999 u-font-28"
+          />
+          <text class="no-wrap color-999 number">数量</text>
+        </view>
+        <view class="u-m-l-20">
+          <up-icon
+            name="minus-circle-fill"
+            color="#EB4F4F"
+            size="18"
+            @click="removeCoupon(index)"
+          ></up-icon>
+        </view>
+      </view>
+    </view>
+    <chooseCoupon
+      v-model="chooseCouponData.couponId"
+      v-model:show="chooseCouponData.show"
+      @confirm="confirmCoupon"
+      :list="couponList"
+    ></chooseCoupon>
+  </view>
+</template>
+
+<script setup>
+import { reactive, ref, onMounted } from "vue";
+import chooseCoupon from "@/pageMarket/components/choose-coupon.vue";
+import { couponPage } from "@/http/api/market/index.js";
+
+const chooseCouponData = reactive({
+  couponId: "",
+  show: false,
+  index: -1,
+  item: null,
+});
+const modelValue = defineModel({
+  type: Array,
+  default: () => [],
+});
+
+function clearCoupon(index) {
+  modelValue.value[index].coupon = { id: null };
+}
+const couponList = ref([]);
+function showCoupon(item, index) {
+  chooseCouponData.couponId = item ? item.id : "";
+  chooseCouponData.show = true;
+  chooseCouponData.index = index;
+  chooseCouponData.item = item;
+}
+function confirmCoupon(e) {
+  modelValue.value[chooseCouponData.index].coupon = e
+}
+function removeCoupon(index) {
+  modelValue.value.splice(index, 1);
+}
+onMounted(() => {
+  couponPage({ size: 999 }).then((res) => {
+    couponList.value = res.records;
+  });
+});
+</script>
+<style lang="scss" scoped>
+.choose-coupon {
+  padding: 10rpx 20rpx;
+  border-radius: 8rpx;
+  border: 1px solid #d9d9d9;
+}
+.input-number-box {
+  border-radius: 8rpx;
+  border: 1px solid #d9d9d9;
+  .input {
+    padding: 10rpx 20rpx;
+  }
+}
+.number {
+  background-color: #f7f7fa;
+  padding: 10rpx 20rpx;
+}
+</style>
diff --git a/pageMarket/superVip/components/fenxiao-mingxi.vue b/pageMarket/superVip/components/fenxiao-mingxi.vue
new file mode 100644
index 0000000..8756e6e
--- /dev/null
+++ b/pageMarket/superVip/components/fenxiao-mingxi.vue
@@ -0,0 +1,197 @@
+<template>
+  <view class="list u-font-28">
+    <view class="u-m-t-32 item" v-for="item in list" :key="item.id">
+      <view class="u-flex u-row-between">
+        <view class="color-666 u-font-24 u-flex">
+          <text class="no-wrap"> 关联订单:</text>
+          <text> {{ item.orderNo }} </text>
+        </view>
+        <view class="status" :class="[item.status]">
+          {{ returnStatus(item.status) }}</view
+        >
+      </view>
+      <view class="u-flex u-row-between u-m-t-16">
+        <view>
+          <view class="color-333 u-font-28 u-flex u-line-1">
+            <text class="font-bold"> 分销员 </text>
+            <text class="color-666 u-font-24 u-m-l-28">
+              {{ item.nickName }}
+            </text>
+            <text class="color-666 u-font-24 u-m-l-10"> {{ item.phone }} </text>
+          </view>
+          <view class="color-333 u-font-28 u-flex u-m-t-16 u-line-1">
+            <text class="font-bold"> 下级用户 </text>
+            <text class="color-666 u-font-24 u-m-l-28">
+              {{ item.sourceNickName }}
+            </text>
+            <text class="color-666 u-font-24 u-m-l-10"> {{ item.sourcePhone }} </text>
+          </view>
+          <view class="color-333 u-font-28 u-flex u-m-t-16 u-line-1">
+            <text class="font-bold"> 创建时间 </text>
+            <text class="color-666 u-font-24 u-m-l-28">
+              {{ item.sourceNickName }}
+            </text>
+            <text class="color-666 u-font-24 u-m-l-10"> {{ item.createTime }} </text>   
+          </view>
+        </view>
+        <view>
+          <view
+            class="text-center color-main font-bold"
+            :class="[ item.status == 'refund' ? 'color-red' : '']"
+            >{{ item.rewardAmount }}</view
+          >
+          <view class="color-66 u-font-24">{{
+            item.level == 1 ? "直接分成" : "间接分成"
+          }}</view>
+        </view>
+      </view>
+    </view>
+    <view class="u-p-30">
+      <up-loadmore :status="isEnd ? 'nomore' : 'loading'"></up-loadmore>
+    </view>
+  </view>
+</template>
+<script setup>
+import {
+  ref,
+  reactive,
+  watch,
+  toRaw,
+  onMounted,
+  onUnmounted,
+  inject,
+} from "vue";
+
+const props = defineProps({
+  list: {
+    type: Array,
+    default: () => [],
+  },
+  isEnd: {
+    type: Boolean,
+    default: false,
+  },
+});
+
+const statusMap = {
+  success: "已入账",
+  refund: "已退款",
+  pending: "待入账",
+};
+function returnStatus(status) {
+  return status in statusMap ? statusMap[status] : status;
+}
+
+const $actions = [
+  {
+    name: "更改分销组",
+    value: "change-group",
+  },
+  {
+    name: "重置分销组",
+    value: "reset-group",
+  },
+  {
+    name: "恢复分销员",
+    value: "back-fenxiao",
+  },
+  {
+    name: "取消分销员",
+    value: "cancel-fenxiao",
+  },
+];
+const actions = ref($actions);
+
+const emits = defineEmits(["refresh"]);
+</script>
+<style lang="scss">
+.list {
+  padding: 0 30rpx;
+
+  .item {
+    padding: 32rpx 24rpx;
+    border-radius: 14rpx;
+    background-color: #fff;
+    overflow: hidden;
+  }
+}
+
+.tag {
+  border-radius: 12rpx;
+  padding: 8rpx 22rpx;
+  font-size: 28rpx;
+
+  &.success {
+    background-color: #edfff0;
+    color: #5bbc6d;
+  }
+
+  &.end {
+    background-color: #f7f7f7;
+    color: #999;
+  }
+}
+
+.my-btn {
+  font-size: 28rpx;
+  line-height: 36rpx;
+  padding: 8rpx 32rpx;
+  border-radius: 12rpx;
+  margin: 0;
+}
+.money {
+  background-color: #f8f8f8;
+  border-radius: 8rpx;
+  padding: 16rpx 28rpx;
+}
+.more {
+  display: flex;
+  height: 56rpx;
+  padding: 8rpx 28rpx;
+  justify-content: center;
+  align-items: center;
+  gap: 20rpx;
+  border-radius: 28rpx;
+  border: 2rpx solid $my-main-color;
+  color: $my-main-color;
+  background: #fff;
+}
+
+.bottom {
+  position: fixed;
+  bottom: calc(env(safe-area-inset-bottom) + 30rpx);
+  left: 30rpx;
+  right: 30rpx;
+}
+.status {
+  display: flex;
+  padding: 8rpx 18rpx;
+  justify-content: center;
+  align-items: center;
+  gap: 20rpx;
+  font-size: 28rpx;
+  border-radius: 0 0 8rpx 8rpx;
+  border: 1px solid transparent;
+  &.success {
+    color: rgba(123, 209, 54, 1);
+    border-color: rgba(123, 209, 54, 1);
+    background-color: rgba(123, 209, 54, 0.12);
+  }
+  &.refund {
+    border-color: rgba(249, 50, 40, 1);
+    background-color: rgba(209, 64, 54, 0.12);
+    color: rgba(255, 47, 47, 1);
+  }
+  &.pending {
+    border-color: rgba(153, 153, 153, 1);
+    background-color: rgba(153, 153, 153, 0.12);
+    color: rgba(153, 153, 153, 1);
+  }
+}
+.color-red {
+  color: #ff2f2f;
+}
+.text-center{
+    text-align: center;
+}
+</style>
diff --git a/pageMarket/superVip/components/open-list.vue b/pageMarket/superVip/components/open-list.vue
new file mode 100644
index 0000000..0f302f1
--- /dev/null
+++ b/pageMarket/superVip/components/open-list.vue
@@ -0,0 +1,258 @@
+<template>
+  <view class="list u-font-28">
+    <view class="u-m-t-32 item" v-for="item in list" :key="item.id">
+      <view class="u-flex u-row-between">
+        <view class="color-666 u-font-24 u-flex">
+          <text class="no-wrap"> 订单号:</text>
+          <text> {{ item.orderNo }} </text>
+        </view>
+      </view>
+      <view class="u-m-t-32 u-flex u-row-between">
+        <view class="color-333 u-font-28">
+          <view>
+            <text> {{ item.nickName }} </text>
+            <text> {{ item.phone }}</text>
+          </view>
+          <view class="u-m-t-8 color-999 u-font-24">
+            <view>{{ item.createTime }}</view>
+          </view>
+        </view>
+        <view class="text-center">
+          <view class="color-red u-font-32 font-700">
+            {{ item.amount }}
+          </view>
+          <view class="u-m-t-2 color-999 u-font-24">
+            <view>{{ item.circleTime }}个{{ item.circleUnit }}</view>
+          </view>
+        </view>
+      </view>
+    </view>
+    <view class="u-p-30">
+      <up-loadmore :status="isEnd ? 'nomore' : 'loading'"></up-loadmore>
+    </view>
+
+    <up-action-sheet
+      :show="showActions"
+      :actions="actions"
+      @select="handleSelect"
+      @close="showActions = false"
+      cancel-text="取消"
+    ></up-action-sheet>
+    <Modal
+      v-model="modalData.show"
+      :title="modalData.title"
+      @confirm="handleConfirm"
+    >
+      <view class="u-p-48" v-if="modalData.key == 'change-group'">
+        <view class="u-m-r-36 u-m-b-24">分销组</view>
+        <up-radio-group v-model="group" placement="row" place="row">
+          <up-radio
+            v-for="item in distributionStore.config.levelConfigList"
+            :key="item.id"
+            :name="item.id"
+            :label="item.name"
+          >
+            <template #label>
+              <text>
+                {{ item.name }}
+              </text>
+            </template>
+          </up-radio>
+        </up-radio-group>
+      </view>
+      <view class="u-p-48 u-flex" v-if="modalData.key == 'reset-group'">
+        <up-icon name="info-circle" color="#FF2F2F" size="20"></up-icon>
+        <view class="u-font-32 color-333 u-m-l-20"
+          >是否确认重置分销组 重置后将会按照用户的实际数据匹配分销组</view
+        >
+      </view>
+      <view class="u-p-48 u-flex" v-if="modalData.key == 'cancel-group'">
+        <up-icon name="info-circle" color="#FF2F2F" size="20"></up-icon>
+        <view class="u-font-32 color-333 u-m-l-20">是否确认取消分销员</view>
+      </view>
+    </Modal>
+  </view>
+</template>
+<script setup>
+import {
+  ref,
+  reactive,
+  watch,
+  toRaw,
+  onMounted,
+  onUnmounted,
+  inject,
+} from "vue";
+import go from "@/commons/utils/go.js";
+
+import Modal from "@/pageMarket/components/modal.vue";
+const props = defineProps({
+  list: {
+    type: Array,
+    default: () => [],
+  },
+  isEnd: {
+    type: Boolean,
+    default: false,
+  },
+});
+
+//选中的分销组
+const group = ref("");
+
+const distributionStore = inject("distributionStore");
+const distributionApi = inject("distributionApi");
+const modalData = reactive({
+  show: false,
+  title: "",
+  key: "",
+  data: null,
+});
+const showActions = ref(false);
+const $actions = [
+  {
+    name: "更改分销组",
+    value: "change-group",
+  },
+  {
+    name: "重置分销组",
+    value: "reset-group",
+  },
+  {
+    name: "恢复分销员",
+    value: "back-fenxiao",
+  },
+  {
+    name: "取消分销员",
+    value: "cancel-fenxiao",
+  },
+];
+const actions = ref($actions);
+function moreShow(item) {
+  modalData.data = item;
+  group.value = item.distributionLevelId;
+  if (item.isAssignLevel == 0) {
+    actions.value = $actions.filter((item) => item.value !== "reset-group");
+  } else {
+    actions.value = $actions.filter((item) => item.value !== "change-group");
+  }
+  if (item.status == 1) {
+    actions.value = actions.value.filter(
+      (item) => item.value !== "back-fenxiao"
+    );
+  }
+  if (item.status == 9) {
+    actions.value = actions.value.filter(
+      (item) => item.value !== "cancel-fenxiao"
+    );
+  }
+  showActions.value = true;
+}
+function handleSelect(item) {
+  console.log(item);
+  modalData.title = item.name;
+  modalData.key = item.value;
+
+  showActions.value = false;
+  modalData.show = true;
+}
+
+const emits = defineEmits(["refresh"]);
+
+async function handleConfirm() {
+  if (modalData.key == "reset-group") {
+    await distributionApi.resetLevel({
+      id: modalData.data.id,
+      shopId: uni.getSystemInfoSync("shopInfo").id || "",
+    });
+  }
+  if (modalData.key == "change-group") {
+    const level = distributionStore.config.levelConfigList.find(
+      (item) => item.id == group.value
+    );
+    await distributionApi.editDistributionUser({
+      id: modalData.data.id,
+      isAssignLevel: 1,
+      distributionLevelId: group.value,
+      distributionLevelName: level.name,
+    });
+    emits("refresh");
+  }
+  if (modalData.key == "cancel-fenxiao") {
+    await distributionApi.editDistributionUser({
+      id: modalData.data.id,
+      status: 9,
+    });
+    emits("refresh");
+  }
+  if (modalData.key == "back-fenxiao") {
+    await distributionApi.editDistributionUser({
+      id: modalData.data.id,
+      status: 1,
+    });
+    emits("refresh");
+  }
+  group.value = "";
+  modalData.show = false;
+}
+</script>
+<style lang="scss">
+.list {
+  padding: 0 30rpx;
+
+  .item {
+    padding: 32rpx 24rpx;
+    border-radius: 14rpx;
+    background-color: #fff;
+    overflow: hidden;
+  }
+}
+
+.tag {
+  border-radius: 12rpx;
+  padding: 8rpx 22rpx;
+  font-size: 28rpx;
+
+  &.success {
+    background-color: #edfff0;
+    color: #5bbc6d;
+  }
+
+  &.end {
+    background-color: #f7f7f7;
+    color: #999;
+  }
+}
+
+.my-btn {
+  font-size: 28rpx;
+  line-height: 36rpx;
+  padding: 8rpx 32rpx;
+  border-radius: 12rpx;
+  margin: 0;
+}
+.money {
+  background-color: #f8f8f8;
+  border-radius: 8rpx;
+  padding: 16rpx 28rpx;
+}
+.more {
+  display: flex;
+  height: 56rpx;
+  padding: 8rpx 28rpx;
+  justify-content: center;
+  align-items: center;
+  gap: 20rpx;
+  border-radius: 28rpx;
+  border: 2rpx solid $my-main-color;
+  color: $my-main-color;
+  background: #fff;
+}
+
+.bottom {
+  position: fixed;
+  bottom: calc(env(safe-area-inset-bottom) + 30rpx);
+  left: 30rpx;
+  right: 30rpx;
+}
+</style>
diff --git a/pageMarket/superVip/components/user-types.vue b/pageMarket/superVip/components/user-types.vue
new file mode 100644
index 0000000..d8988cf
--- /dev/null
+++ b/pageMarket/superVip/components/user-types.vue
@@ -0,0 +1,70 @@
+<template>
+  <view>
+    <up-radio-group v-model="userType" placement="row">
+      <up-radio
+        v-for="item in userTypeList"
+        :key="item.value"
+        :name="item.value"
+        :label="item.label"
+      >
+    <template #label>
+        <text>
+          {{ item.label }}
+        </text>
+        <text v-if="item.desc" class="color-666 u-font-24">
+          {{ item.desc }}
+        </text>
+    </template>
+    </up-radio>
+    </up-radio-group>
+  </view>
+</template>
+  <script setup>
+import { onMounted, reactive, ref, watch } from "vue";
+
+const userType = defineModel({
+  default: () => "all",
+  type: String,
+});
+const userTypeList = [
+  {
+    value: "all",
+    label: "全部用户",
+  },
+  {
+    value: "new",
+    label: "仅限新用户",
+  },
+  {
+    value: "vip",
+    label: "仅会员",
+    desc:'（分店需开启超级会员可用）'
+  },
+];
+</script>
+  <style lang="scss">
+.box {
+  margin-top: 16rpx;
+  display: flex;
+  flex-direction: row;
+  align-items: top;
+  flex-wrap: wrap;
+  padding: 10rpx 24rpx;
+  border: 2rpx solid #e5e5e5;
+  position: relative;
+  .icon {
+    position: absolute;
+    top: 50%;
+    right: 24rpx;
+    transform: translateY(-50%);
+  }
+}
+.shop-item {
+  padding: 4rpx 8rpx 4rpx 16rpx;
+  border-radius: 4rpx;
+  border: 2rpx solid #f0f0f0;
+  background-color: #f5f5f5;
+  margin-bottom: 16rpx;
+  margin-left: 16rpx;
+}
+</style>
\ No newline at end of file
diff --git a/pageMarket/superVip/components/vip-lv-list.vue b/pageMarket/superVip/components/vip-lv-list.vue
new file mode 100644
index 0000000..5be60e4
--- /dev/null
+++ b/pageMarket/superVip/components/vip-lv-list.vue
@@ -0,0 +1,172 @@
+<template>
+  <view class="list u-font-28 color-333">
+    <view class="u-m-t-32 item" v-for="(item, index) in list" :key="item.id">
+      <view class="color-000 font-bold u-font-32">
+        <view> {{ item.name }} </view>
+      </view>
+      <view class="u-m-t-32 u-flex">
+        <view class="u-flex-1">
+          <text class="color-666">所需成长值：</text>
+          <text>{{ item.experienceValue || 0 }}</text>
+        </view>
+        <view class="u-flex-1">
+          <text class="color-666">会员折扣：</text>
+          <text>{{ item.discount || 100 }}%</text>
+        </view>
+      </view>
+
+      <view class="u-m-t-32 u-flex u-row-right gap-20">
+        <view class="del" @click="delItem(item)" v-if="index != 0">删除</view>
+        <view class="edit" @click="editItem(item)">编辑</view>
+      </view>
+    </view>
+    <view class="u-p-30">
+      <up-loadmore :status="isEnd ? 'nomore' : 'loading'"></up-loadmore>
+    </view>
+    <view style="height: 100rpx"></view>
+    <view class="bottom">
+      <my-button @click="go.to('PAGES_MARKET_SUPER_VIP_LV_ADD')">
+        <view class="u-flex">
+          <text>+ 添加会员等级</text>
+        </view>
+      </my-button>
+    </view>
+  </view>
+</template>
+<script setup>
+import {
+  ref,
+  reactive,
+  watch,
+  toRaw,
+  onMounted,
+  onUnmounted,
+  inject,
+} from "vue";
+import go from "@/commons/utils/go.js";
+const memberApi=inject('memberApi')
+const props = defineProps({
+  list: {
+    type: Array,
+    default: () => [],
+  },
+  isEnd: {
+    type: Boolean,
+    default: false,
+  },
+});
+
+function delItem(item) {
+  uni.showModal({
+    title: "提示",
+    content: "确定删除该会员等级吗？",
+    success: (res) => {
+      if (res.confirm) {
+        memberApi.levelDel(item.id).then((res) => {
+          if (res) {
+            uni.showToast({
+              title: "删除成功",
+              icon: "none",
+            });
+            emits("refresh");
+          }
+        });
+      }
+    },
+  });
+}
+
+function editItem(item) {
+  go.to("PAGES_MARKET_SUPER_VIP_LV_ADD", {
+    id: item.id,
+    type: "edit",
+  });
+}
+
+const emits = defineEmits(["refresh"]);
+</script>
+<style lang="scss">
+.list {
+  padding: 0 30rpx;
+
+  .item {
+    padding: 32rpx 24rpx;
+    border-radius: 14rpx;
+    background-color: #fff;
+    overflow: hidden;
+  }
+}
+
+.tag {
+  border-radius: 12rpx;
+  padding: 8rpx 22rpx;
+  font-size: 28rpx;
+
+  &.success {
+    background-color: #edfff0;
+    color: #5bbc6d;
+  }
+
+  &.end {
+    background-color: #f7f7f7;
+    color: #999;
+  }
+}
+
+.my-btn {
+  font-size: 28rpx;
+  line-height: 36rpx;
+  padding: 8rpx 32rpx;
+  border-radius: 12rpx;
+  margin: 0;
+}
+.money {
+  background-color: #f8f8f8;
+  border-radius: 8rpx;
+  padding: 16rpx 28rpx;
+}
+.more {
+  display: flex;
+  height: 56rpx;
+  padding: 8rpx 28rpx;
+  justify-content: center;
+  align-items: center;
+  gap: 20rpx;
+  border-radius: 28rpx;
+  border: 2rpx solid $my-main-color;
+  color: $my-main-color;
+  background: #fff;
+}
+.del {
+  display: flex;
+  height: 56rpx;
+  padding: 8rpx 28rpx;
+  justify-content: center;
+  align-items: center;
+  gap: 20rpx;
+  border-radius: 28rpx;
+  border: 2rpx solid #f7f7fa;
+  color: #999;
+  background: #f7f7fa;
+}
+.edit {
+  display: flex;
+  height: 56rpx;
+  padding: 8rpx 28rpx;
+  justify-content: center;
+  align-items: center;
+  gap: 20rpx;
+  border-radius: 28rpx;
+  border: 2rpx solid $my-main-color;
+
+  color: #fff;
+  background: $my-main-color;
+}
+
+.bottom {
+  position: fixed;
+  bottom: calc(env(safe-area-inset-bottom) + 30rpx);
+  left: 30rpx;
+  right: 30rpx;
+}
+</style>
diff --git a/pageMarket/superVip/index.vue b/pageMarket/superVip/index.vue
new file mode 100644
index 0000000..cd10f41
--- /dev/null
+++ b/pageMarket/superVip/index.vue
@@ -0,0 +1,447 @@
+<template>
+  <view class="min-page u-font-28">
+    <up-sticky>
+      <view class="bg-fff top">
+        <view class="bg-fff container u-flex u-m-b-48">
+          <image
+            style="width: 60rpx; height: 60rpx"
+            src="/pageMarket/static/images/member.png"
+          ></image>
+          <view class="u-flex-1 u-flex u-p-l-24">
+            <view class="u-font-28 u-flex-1 u-p-r-4">
+              <view class="color-333 font-bold">超级会员</view>
+              <view class="color-666 u-m-t-4 u-font-24">用户会员管理设置 </view>
+            </view>
+            <up-switch
+              v-model="superVipStore.config.isOpen"
+              size="18"
+              active-value="1"
+              inactive-value="0"
+            ></up-switch>
+          </view>
+        </view>
+        <my-tabs v-model="active" :list="tabs" textKey="label"></my-tabs>
+        <view
+          v-if="active == 2"
+          class="u-flex u-row-between u-m-t-32"
+          style="gap: 58rpx"
+        >
+          <view class="u-flex-1 filter-box" style="border-radius: 100rpx">
+            <up-icon name="search" size="18"></up-icon>
+            <input
+              class="u-m-l-10 u-font-28"
+              type="text"
+              placeholder-class="color-999 u-font-28"
+              placeholder="搜索关键词"
+              v-model="keyWord"
+              @blur="keyWordBlur"
+            />
+            <up-icon
+              v-if="keyWord"
+              name="close"
+              size="14"
+              @click="clearKeyWord"
+            ></up-icon>
+          </view>
+          <view
+            class="u-flex-1 u-font-28 filter-box u-flex u-row-between"
+            @click="showTimeArea = true"
+          >
+            <template
+              v-if="userComponentQuery.startTime && userComponentQuery.endTime"
+            >
+              <text class="u-font-20">
+                {{ userComponentQuery.startTime }} -
+                {{ userComponentQuery.endTime }}
+              </text>
+              <view @click.stop="clearTime">
+                <up-icon name="close" size="14"></up-icon>
+              </view>
+            </template>
+            <template v-else>
+              <text class="color-999">请选择日期范围</text>
+              <up-icon name="arrow-right" size="12"></up-icon>
+            </template>
+          </view>
+        </view>
+
+        <view v-if="active == 2" class="u-flex u-p-l-32 u-p-r-32 u-m-t-32">
+          <view class="u-flex-1 u-text-center">
+            <view class="u-font-32 color-main font-bold">{{
+              listRes.totalRow
+            }}</view>
+            <view class="u-font-24 color-666 u-m-t-16">订单数</view>
+          </view>
+          <view class="u-flex-1 u-text-center">
+            <view class="u-font-32 color-main font-bold">{{
+              listRes.totalAmount
+            }}</view>
+            <view class="u-font-24 color-666 u-m-t-16">订单金额（元）</view>
+          </view>
+        </view>
+        <view v-if="active == 3" class="u-flex u-m-t-32">
+          <view class="u-flex-1 u-text-center">
+            <view class="u-font-32 color-main font-bold">{{
+              listRes.successAmount
+            }}</view>
+            <view class="u-font-24 color-666 u-m-t-16">已入账金额（元）</view>
+          </view>
+          <view class="u-flex-1 u-text-center">
+            <view class="u-font-32 color-main font-bold">{{
+              listRes.pendingAmount || 0
+            }}</view>
+            <view class="u-font-24 color-666 u-m-t-16">待入账金额（元）</view>
+          </view>
+          <view class="u-flex-1 u-text-center">
+            <view class="u-font-32 color-main font-bold">{{
+              listRes.balanceAmount
+            }}</view>
+            <view class="u-font-24 color-666 u-m-t-16">
+              <text>运营余额（元）</text>
+              <text class="color-main" @click="go.to('PAGES_PAY')"
+                >充值{{ ">" }}</text
+              >
+            </view>
+          </view>
+        </view>
+      </view>
+    </up-sticky>
+    <configVue v-if="active == 0"></configVue>
+    <vipLvList
+      v-if="active == 1"
+      :list="list"
+      :isEnd="isEnd"
+      @refresh="refresh"
+    ></vipLvList>
+
+    <openListVue
+      v-if="active == 2"
+      :list="list"
+      :isEnd="isEnd"
+      @refresh="refresh"
+    ></openListVue>
+    <fenxiaoMingxiVue
+      v-if="active == 3"
+      :list="list"
+      :isEnd="isEnd"
+      @refresh="refresh"
+    ></fenxiaoMingxiVue>
+    <!-- 选择门店 -->
+    <shopSelActionSheetVue
+      @choose="chooseShop"
+      v-model="showShopSelActionSheet"
+      title="选择门店"
+    >
+    </shopSelActionSheetVue>
+
+    <dateAreaSel
+      :show="showTimeArea"
+      :minYear="2022"
+      @close="showTimeArea = false"
+      @confirm="confirmTimeArea"
+    ></dateAreaSel>
+
+    <!-- 分销明细状态 -->
+    <up-action-sheet
+      :show="showActions"
+      :actions="actions"
+      @select="handleSelect"
+      @close="showActions = false"
+      cancel-text="取消"
+    ></up-action-sheet>
+  </view>
+</template>
+<script setup>
+import {
+  onLoad,
+  onReady,
+  onShow,
+  onPageScroll,
+  onReachBottom,
+  onBackPress,
+} from "@dcloudio/uni-app";
+import go from "@/commons/utils/go.js";
+import { ref, onMounted, watch, provide } from "vue";
+import * as consumeCashbackApi from "@/http/api/market/consumeCashback.js";
+import * as memberApi from "@/http/api/market/member.js";
+import configVue from "./components/config.vue";
+import shopSelActionSheetVue from "@/pageMarket/components/shop-sel-action-sheet.vue";
+import dateAreaSel from "@/components/date-range-picker/date-range-picker.vue";
+import vipLvList from "./components/vip-lv-list.vue";
+import openListVue from "./components/open-list.vue";
+import fenxiaoMingxiVue from "./components/fenxiao-mingxi.vue";
+
+import { useSuperVipStore } from "@/store/market.js";
+import { reactive } from "vue";
+
+const actions = [
+  {
+    name: "全部",
+    value: "",
+  },
+  {
+    name: "已入账",
+    value: "success",
+  },
+  {
+    name: "待入账",
+    value: "pending",
+  },
+  {
+    name: "已退款",
+    value: "refund",
+  },
+];
+function clearKeyWord() {
+  keyWord.value = "";
+  userComponentQuery.user = "";
+}
+function clearTime() {
+  userComponentQuery.startTime = "";
+  userComponentQuery.endTime = "";
+}
+const selActions = ref("");
+const showActions = ref(false);
+function handleSelect(e) {
+  selActions.value = e;
+}
+
+const superVipStore = useSuperVipStore();
+superVipStore.getConfig();
+provide("superVipStore", superVipStore);
+provide("memberApi", memberApi);
+const showTimeArea = ref(false);
+function confirmTimeArea(e) {
+  console.log(e);
+  userComponentQuery.startTime = e[0];
+  userComponentQuery.endTime = e[1];
+}
+const tabs = [
+  {
+    label: "会员基础设置",
+    value: "basic",
+  },
+  {
+    label: "会员等级设置",
+    value: "user",
+  },
+  {
+    label: "购买会员订单",
+    value: "recoders",
+  },
+];
+
+const keyWord = ref("");
+function keyWordBlur() {
+  userComponentQuery.user = keyWord.value;
+}
+const userComponentQuery = reactive({
+  user: "",
+  startTime: "",
+  endTime: "",
+});
+
+const form = ref({
+  isOpen: 0,
+});
+
+const list = ref([]);
+const pageNum = ref(1);
+const isEnd = ref(false);
+const selShop = ref({
+  shopId: "",
+  shopName: "",
+});
+const searchText = ref("");
+
+function search() {
+  pageNum.value = 1;
+  getList();
+}
+
+function chooseShop(e) {
+  selShop.value = e;
+}
+
+watch(
+  () => selShop.value.shopId,
+  (newval) => {
+    pageNum.value = 1;
+    getList();
+  }
+);
+
+watch(
+  () => userComponentQuery,
+  (newval) => {
+    isEnd.value = false;
+    pageNum.value = 1;
+
+    getList();
+  },
+  {
+    deep: true,
+  }
+);
+
+function refresh() {
+  isEnd.value = false;
+  pageNum.value = 1;
+  getList();
+}
+
+const listRes = ref({});
+async function getList() {
+  let res = null;
+  if (active.value == 1) {
+    //会员等级列表
+    res = await memberApi.levelList();
+    if (res) {
+      list.value = res || [];
+      isEnd.value = true;
+      superVipStore.setVipLevelList(res || []);
+    }
+    return;
+  }
+  if (active.value == 2) {
+    //购买会员订单记录
+    res = await memberApi.orderList({
+      page: pageNum.value,
+      size: 10,
+      key: userComponentQuery.user,
+      startTime: userComponentQuery.startTime
+        ? userComponentQuery.startTime + " 00:00:00"
+        : "",
+      endTime: userComponentQuery.endTime
+        ? userComponentQuery.endTime + " 23:59:59"
+        : "",
+    });
+  }
+
+  if (res) {
+    listRes.value = res;
+    if (pageNum.value == 1) {
+      list.value = res.records || [];
+    } else {
+      list.value = [...list.value, ...(res.records || [])];
+    }
+    isEnd.value = pageNum.value >= res.totalPage * 1 ? true : false;
+    console.log(isEnd.value);
+  }
+}
+
+// 显示选择门店弹窗
+const showShopSelActionSheet = ref(false);
+
+function showShopSelActionSheetFun() {
+  showShopSelActionSheet.value = true;
+}
+const active = ref(0);
+
+watch(
+  () => active.value,
+  (newval) => {
+    userComponentQuery.startTime = "";
+    userComponentQuery.endTime = "";
+    keyWord.value = "";
+    refresh();
+  }
+);
+watch(
+  () => selActions.value,
+  () => {
+    refresh();
+  }
+);
+onReachBottom(() => {
+  if (!isEnd.value) {
+    pageNum.value++;
+    getList();
+  }
+});
+watch(
+  () => superVipStore.config.isOpen,
+  () => {
+    superVipStore.editConfig().then((res) => {
+      if (res) {
+        uni.showToast({
+          title: "更新成功",
+          icon: "none",
+          duration: 2000,
+        });
+      }
+    });
+  }
+);
+onShow(() => {
+  pageNum.value = 1;
+  getList();
+});
+</script>
+<style lang="scss" scoped>
+.min-page {
+  background: #f7f7f7;
+}
+
+.box {
+}
+
+.top {
+  padding: 32rpx 24rpx;
+}
+
+.list {
+  padding: 0 30rpx;
+
+  .item {
+    padding: 32rpx 24rpx;
+    border-radius: 14rpx;
+    background-color: #fff;
+    overflow: hidden;
+  }
+}
+
+.tag {
+  border-radius: 12rpx;
+  padding: 8rpx 22rpx;
+  font-size: 28rpx;
+
+  &.success {
+    background-color: #edfff0;
+    color: #5bbc6d;
+  }
+
+  &.end {
+    background-color: #f7f7f7;
+    color: #999;
+  }
+}
+
+.my-btn {
+  font-size: 28rpx;
+  line-height: 36rpx;
+  padding: 8rpx 32rpx;
+  border-radius: 12rpx;
+  margin: 0;
+}
+
+.edit-btn {
+  background: #e6f0ff;
+  color: $my-main-color;
+}
+
+.delete-btn {
+  background: #ffe7e6;
+  color: #ff1c1c;
+}
+.filter-box {
+  display: flex;
+  padding: 8rpx 24rpx;
+  align-items: center;
+  border-radius: 8rpx;
+  border: 2rpx solid #d9d9d9;
+  background: #f7f7f7;
+  min-height: 62rpx;
+  box-sizing: border-box;
+}
+</style>
diff --git a/pageMarket/superVip/level-list.vue b/pageMarket/superVip/level-list.vue
new file mode 100644
index 0000000..07e0768
--- /dev/null
+++ b/pageMarket/superVip/level-list.vue
@@ -0,0 +1,366 @@
+<template>
+  <view class="min-page u-font-28">
+    <view class="container first">
+      <view class="title">升级条件</view>
+      <view class="u-m-t-16">
+        <up-radio-group v-model="form.upgradeType" placement="row">
+          <up-radio
+            v-for="item in distributionStore.upgradeTypes"
+            :key="item.value"
+            :name="item.value"
+            :label="item.label"
+          >
+            <template #label>
+              <text>
+                {{ item.label }}
+              </text>
+            </template>
+          </up-radio>
+        </up-radio-group>
+      </view>
+    </view>
+    <view class="container" v-for="(item,index) in form.levelConfigList">
+      <view class="u-flex u-row-between">
+        <text class="font-bold color-333 u-font-32">{{index+1}}级：{{ item.name }}</text>
+        <view class="u-flex" @click="toggle(index)">
+            <text class="color-main u-m-r-14">展开</text>
+            <view class="u-flex arrow" :class="[!showDetailListSwitch[index]?'rotate' : '']">
+                <up-icon name="arrow-down" color="#318AFE" ></up-icon>
+            </view>
+        </view>
+      </view>
+      <template v-if="showDetailListSwitch[index]">
+      <view class="u-m-t-60">
+        <view class="title">名称</view>
+        <view class="u-p-t-16 u-p-b-24">
+            <input placeholder="请输入名称" placeholder-class="color-999 u-font-28" v-model="item.name" @input="checkName($event, index)"></input>
+        </view>
+        <up-line></up-line>
+        <view class="title u-m-t-24">分成比例</view>
+        <view class="u-m-t-16 u-p-b-24">
+            <view class="u-flex u-m-t-16">
+            <input
+              class="number-box"
+              placeholder="请输入"
+              placeholder-class="color-999 u-font-28"
+              type="digit"
+              @input="checkNumberCommission($event,index)"
+              v-model="item.levelOneCommission"
+            />
+            <view class="unit">%</view>
+          </view>
+        </view>
+        <template v-if="form.upgradeType!='not_upgrade'">
+          <up-line></up-line>
+        <template v-if="form.upgradeType!='cost'">
+          <view class="title u-m-t-24">有效人数</view>
+        <view class="u-m-t-16 u-p-b-8">
+            <view class="u-flex u-m-t-16">
+            <input
+              :disabled="index==0?true:false"
+              :class="{'disabled':index==0?true:false}"
+
+              class="number-box"
+              placeholder="请输入"
+              placeholder-class="color-999 u-font-28"
+              type="number"
+              v-model="item.inviteCount"
+            />
+            <view class="unit">人</view>
+          </view>
+        </view>
+
+        <view class="color-999 u-font-24">有效人数：被邀请人在店铺消费过，即有一笔订单完成</view>
+
+        </template>
+        <template v-else>
+          <view class="title u-m-t-24">消费金额达</view>
+        <view class="u-m-t-16 u-p-b-8">
+            <view class="u-flex u-m-t-16">
+            <input
+              class="number-box"
+              :disabled="index==0?true:false"
+              :class="{'disabled':index==0?true:false}"
+              placeholder="请输入"
+              placeholder-class="color-999 u-font-28"
+              type="digit"
+              v-model="item.costAmount"
+            />
+            <view class="unit">元</view>
+          </view>
+        </view>
+        <view class="color-999 u-font-24">消费金额：分销员和被邀请人在店铺订单消费总金额（不包含退款）</view>
+
+        </template>
+        </template>
+
+   
+        <view class="u-m-t-24 u-flex u-row-right" style="gap: 40rpx;">
+            <view class="u-flex" v-if="index==0||index==form.levelConfigList.length-1" @click="addLevelConfig">
+                <up-icon name="plus-circle-fill" color="#318AFE" ></up-icon>
+                <text class="u-m-l-16">{{index==0? '添加':'继续添加'}}</text>
+            </view>
+            <view class="u-flex" @click="remove(index)" v-if="index!=0">
+                <up-icon name="minus-circle-fill" color="#EB4F4F" ></up-icon>
+                <text class="u-m-l-16">删除</text>
+            </view>
+        </view>
+      </view>
+    </template>
+    </view>
+
+
+    <my-bottom-btn-group @save="save" @cancel="cancel"></my-bottom-btn-group>
+
+  </view>
+</template>
+<script setup>
+import {
+  onLoad,
+  onReady,
+  onShow,
+  onPageScroll,
+  onReachBottom,
+  onBackPress,
+} from "@dcloudio/uni-app";
+
+import { ref, onMounted, watch, reactive , computed} from "vue";
+import { useDistributionStore } from "@/store/market.js";
+
+const distributionStore = useDistributionStore();
+
+const form = reactive({
+  upgradeType: "",
+  levelConfigList:[]
+});
+
+const showDetailListSwitch=ref([true])
+
+function toggle(index) {
+  showDetailListSwitch.value[index] = !showDetailListSwitch.value[index];
+}
+
+//现在全部的分成比例总和
+const allCommission=()=>{
+    let sum=0
+    for(let item of form.levelConfigList){
+        sum+=parseFloat(item.levelOneCommission)
+    }
+    return sum
+}
+
+
+let timer=null
+//全部的分成比例加起来不能超过100%
+function checkNumberCommission(e,index){
+    const value=e.detail.value
+    clearInterval(timer)
+    
+    if(value>100){
+        uni.showToast({
+            title:'分成比例不能超过100',
+            icon:'none'
+        })
+        timer= setTimeout(()=>{
+                 form.levelConfigList[index].levelOneCommission=''
+            },30) 
+       
+        return false
+    }
+    //输入最多两位小数，两位小数点后的去除掉不让输入
+    if(value.indexOf('.')!=-1){
+        const arr=value.split('.')
+        if(arr[1].length>2){
+            timer= setTimeout(()=>{
+                form.levelConfigList[index].levelOneCommission=arr[0]+'.'+arr[1].substring(0,2)
+            },30)
+        }
+    }
+ 
+}
+
+function checkName(e,index){
+    const value=e.detail.value
+    if(value.length>10){
+        uni.showToast({
+            title:'名称最多10个字符',
+            icon:'none'
+        })
+        timer= setTimeout(()=>{
+          form.levelConfigList[index].name=value.substring(0,10)
+
+            },30)
+        return false
+    }
+}
+function remove(index){
+    form.levelConfigList.splice(index,1)
+    showDetailListSwitch.value.splice(index,1)
+}
+function addLevelConfig(){
+    form.levelConfigList.push({
+        name:'',
+        levelOneCommission:'',
+        inviteCount:'',
+        costAmount:''
+    })
+    showDetailListSwitch.value.push(true)
+}
+  //判断输入每一项是否为空
+  function checkInput(){ 
+    for(let item of form.levelConfigList){
+        if(!item.name){
+            uni.showToast({
+                title:'请输入名称',
+                icon:'none'
+
+            })
+            return false
+        }
+        if(!item.levelOneCommission){
+            uni.showToast({
+                title:'请输入分成比例',
+                icon:'none'
+
+            })
+            return false
+        }
+        if(form.upgradeType==='not_upgrade'){
+            continue
+        }
+        if(form.upgradeType==='cost'){
+            if(item.costAmount===''||item.costAmount===null){
+                uni.showToast({
+                    title:'请输入消费金额',
+                    icon:'none'
+                })
+                return false
+            }
+        }else{
+            if(item.inviteCount===''||item.inviteCount===null){
+                uni.showToast({
+                    title:'请输入有效人数',
+                    icon:'none'
+                })
+                return false
+            }
+
+        }
+        
+    }
+    return true
+  }
+async function save(){
+    const isPas=checkInput()
+    if(!isPas){
+        return
+    }
+
+    await distributionStore.editConfig(form)
+    uni.showToast({
+        title:'保存成功',
+        icon:'none'
+    })
+    setTimeout(() => {
+        uni.navigateBack({
+        delta:1
+    })
+    }, 1500);
+   
+   
+}
+function cancel(){
+    uni.navigateBack({
+        delta:1
+    })
+}
+onLoad(()=>{
+    showDetailListSwitch.value=distributionStore.config.levelConfigList.map(()=>true)
+    const levelConfigList=[...distributionStore.config.levelConfigList||[]]
+    form.levelConfigList=levelConfigList.length?levelConfigList:[
+    {   name:'',
+        levelOneCommission:'',
+        inviteCount:0,
+        costAmount:0}
+    ]
+    form.upgradeType=distributionStore.config.upgradeType
+})
+</script>
+<style lang="scss" scoped>
+.min-page {
+  background: #f7f7f7;
+  padding: 56rpx 28rpx;
+}
+.container {
+  background: #fff;
+  padding: 32rpx 24rpx;
+  margin-top: 32rpx;
+  border-radius: 16rpx;
+  overflow: hidden;
+}
+.x-padding {
+  padding: 0 24rpx;
+}
+$height: 70rpx;
+.number-box {
+  font-size: 28rpx;
+  padding: 0 26rpx;
+  border-radius: 6rpx 0 0 6rpx;
+  border-top: 2rpx solid #d9d9d9;
+  border-bottom: 2rpx solid #d9d9d9;
+  border-left: 2rpx solid #d9d9d9;
+  background: #fff;
+  box-sizing: border-box;
+  height: $height;
+  flex: 1;
+  line-height: $height;
+  &.disabled{
+    background-color: #f7f7fa;
+    color: #999999;
+  }
+}
+.unit {
+  display: flex;
+  padding: 0 38rpx;
+  height: $height;
+  line-height: $height;
+  align-items: center;
+  border-radius: 0 6rpx 6rpx 0;
+  border: 2rpx solid #d9d9d9;
+  background: #f7f7fa;
+  font-size: 28rpx;
+  color: #999999;
+}
+
+.my-btn {
+  font-size: 28rpx;
+  line-height: 36rpx;
+  padding: 8rpx 32rpx;
+  border-radius: 12rpx;
+  margin: 0;
+}
+
+.edit-btn {
+  background: #e6f0ff;
+  color: $my-main-color;
+}
+
+.delete-btn {
+  background: #ffe7e6;
+  color: #ff1c1c;
+}
+.title {
+  font-weight: 700;
+  color: #333;
+  font-size: 28rpx;
+}
+.first {
+  border-bottom: 2rpx solid #e5e5e5;
+}
+.arrow{
+    transition: all 0.3s ease-in-out;
+    &.rotate{
+        transform: rotate(180deg);
+    }
+}
+</style>
diff --git a/pageMarket/superVip/vip-lv-add.vue b/pageMarket/superVip/vip-lv-add.vue
new file mode 100644
index 0000000..726ea0e
--- /dev/null
+++ b/pageMarket/superVip/vip-lv-add.vue
@@ -0,0 +1,363 @@
+<template>
+  <view class="min-page u-font-28 color-333">
+    <view class="container">
+      <view class="border-bottom u-p-b-16">
+        <view class="font-bold u-m-b-16">会员标题</view>
+        <input
+          v-model="form.name"
+          placeholder="请输入会员标题"
+          :placeholderStyle="placeholderStyle"
+        />
+      </view>
+      <view class="border-bottom u-p-b-16 u-m-t-16">
+        <view class="font-bold u-m-b-16">会员折扣（%）</view>
+        <input
+          v-model="form.discount"
+          placeholder="请输入会员折扣"
+          :placeholderStyle="placeholderStyle"
+        />
+      </view>
+      <view class="u-m-t-16">
+        <view class="font-bold u-m-b-16">所需会员值</view>
+        <input
+          v-model="form.experienceValue"
+          :disabled="optiopns.index == 0 ? true : false"
+          placeholder="请输入所需会员值"
+          :placeholderStyle="placeholderStyle"
+        />
+      </view>
+    </view>
+
+    <view class="container u-flex u-row-between">
+      <view class="font-bold">等级标识</view>
+      <view class="u-flex upload-box">
+        <my-upload-img v-model="form.logo"></my-upload-img>
+      </view>
+    </view>
+    <view class="container">
+      <view class="u-flex u-row-between">
+        <view class="">
+          <view class="font-bold">消费送积分</view>
+          <view class="color-999 u-font-24 u-m-t-2">每消费X元赠送1积分</view>
+        </view>
+        <up-switch
+          :size="20"
+          v-model="form.isCostRewardPoints"
+          :active-value="1"
+          :inactive-value="0"
+        ></up-switch>
+      </view>
+      <view class="bg-gray u-m-t-16" style="padding: 24rpx 72rpx" v-if="form.isCostRewardPoints">
+        <view class="u-flex">
+          <input
+            class="number-box"
+            type="digit"
+            v-model="form.costRewardPoints"
+          />
+          <view class="unit">元</view>
+        </view>
+      </view>
+    </view>
+    <view class="container">
+      <view class="">
+        <view class="font-bold u-m-b-16">等级说明</view>
+        <up-textarea
+          v-model="form.remark"
+          placeholder="请输入等级说明"
+          :placeholderStyle="placeholderStyle"
+        />
+      </view>
+    </view>
+    <view class="container">
+      <view class="u-flex u-row-between">
+        <view class="font-bold u-m-b-16">自动发放</view>
+        <up-switch
+          :size="20"
+          v-model="form.isCycleReward"
+          :active-value="1"
+          :inactive-value="0"
+        ></up-switch>
+      </view>
+      <template v-if="form.isCycleReward">
+      <view class="u-m-t-32">
+        <view class="font-bold u-m-b-16">周期时间</view>
+        <view class="u-flex" style="gap: 24rpx; align-items: stretch">
+          <up-input type="digit" v-model="form.cycleTime"></up-input>
+          <view class="times">
+            <up-select
+              v-model:current="form.cycleUnit"
+              showOptionsLabel
+              label="单位"
+              keyName="value"
+              labelName="label"
+              :options="times"
+              @select="selectItem"
+            ></up-select>
+          </view>
+        </view>
+      </view>
+      <view class="u-m-t-32">
+        <view class="font-bold u-m-b-16">赠送积分</view>
+        <up-input
+          type="number"
+          v-model="form.cycleRewardPoints"
+          placeholder="赠送成长值"
+          :placeholderStyle="placeholderStyle"
+        ></up-input>
+      </view>
+      <view class="font-bold u-m-b-16 u-m-t-32">赠送优惠券</view>
+      <CouponList v-model="form.cycleRewardCouponList"></CouponList>
+      <view class="u-flex">
+        <view class="u-flex gap-20" @click="addCoupon()">
+          <up-icon name="plus-circle-fill" color="#318AFE" size="16"></up-icon>
+          <text class="">添加</text>
+        </view>
+      </view>
+    </template>
+    </view>
+
+    <my-bottom-btn-group @save="save" @cancel="cancel"></my-bottom-btn-group>
+  </view>
+</template>
+<script setup>
+import {
+  onLoad,
+  onReady,
+  onShow,
+  onPageScroll,
+  onReachBottom,
+  onBackPress,
+} from "@dcloudio/uni-app";
+import CouponList from "./components/coupon-list.vue";
+import { ref, onMounted, watch, reactive, computed } from "vue";
+import { useSuperVipStore } from "@/store/market.js";
+import * as memberApi from "@/http/api/market/member.js";
+import { options } from "../../../cashier_wx/uni_modules/uview-plus/components/u-markdown/marked.esm";
+
+const times = [
+  {
+    label: "年",
+    value: "年",
+  },
+  {
+    label: "月",
+    value: "月",
+  },
+  {
+    label: "周",
+    value: "周",
+  },
+  {
+    label: "天",
+    value: "天",
+  },
+];
+const placeholderStyle = {
+  "font-size": "28rpx",
+};
+const superVipStore = useSuperVipStore();
+
+const form = reactive({
+  name: "",
+  experienceValue: 0,
+  discount: 100,
+  logo: '',
+  costRewardPoints: 1,
+  isCostRewardPoints: 0,
+  isCycleReward: 0,
+  cycleTime: 1,
+  cycleUnit: "月",
+  cycleRewardPoints: 1,
+  cycleRewardCouponList: [],
+  remark: "",
+});
+function addCoupon() {
+  form.couponList.push({
+    coupon: { id: null },
+    num: "",
+    title: "",
+  });
+}
+const showDetailListSwitch = ref([true]);
+
+//判断输入每一项是否为空
+function checkInput() {
+  for (let item of form.cycleRewardCouponList) {
+    if (!item.coupon.id) {
+      uni.showToast({
+        title: "请选择优惠券",
+        icon: "none",
+      });
+      return false;
+    }
+    if (!item.num) {
+      uni.showToast({
+        title: "请输入优惠券数量",
+        icon: "none",
+      });
+      return false;
+    }
+  }
+  return true;
+}
+async function save() {
+  const isPas = checkInput();
+  if (!isPas) {
+    return;
+  }
+  if (!form.name) {
+    uni.showToast({
+      title: "请输入会员标题",
+      icon: "none",
+    });
+    return false;
+  }
+  if (!form.discount) {
+    uni.showToast({
+      title: "请输入会员折扣",
+      icon: "none",
+    });
+    return false;
+  }
+  if (!form.experienceValue && optiopns.index != 0) {
+    uni.showToast({
+      title: "请输入所需成长值",
+      icon: "none",
+    });
+    return false;
+  }
+  const submitForm = {
+    ...form,
+  };
+  const res =
+    optiopns.type == "edit"
+      ? await memberApi.levelEdit(submitForm)
+      : await memberApi.levelAdd(submitForm);
+  if (res) {
+    uni.showToast({
+      title: "保存成功",
+      icon: "none",
+    });
+  } else {
+    uni.showToast({
+      title: "保存失败",
+      icon: "none",
+    });
+    return;
+  }
+  setTimeout(() => {
+    uni.navigateBack({
+      delta: 1,
+    });
+  }, 1500);
+}
+function cancel() {
+  uni.navigateBack({
+    delta: 1,
+  });
+}
+const optiopns = reactive({});
+onLoad((opt) => {
+  Object.assign(optiopns, opt);
+  uni.setNavigationBarTitle({
+    title: opt.type !== "edit" ? "添加会员等级" : "编辑会员等级",
+  });
+  if (opt.type === "edit" && opt.id !== undefined && opt.id !== null) {
+    const index = superVipStore.vipLevelList.findIndex(
+      (item) => item.id == opt.id
+    );
+    optiopns.index = index;
+    const item = superVipStore.vipLevelList.find((item) => item.id == opt.id);
+    Object.assign(form, item);
+  }
+});
+</script>
+<style lang="scss" scoped>
+.min-page {
+  background: #f7f7f7;
+  padding: 56rpx 28rpx;
+}
+.container {
+  background: #fff;
+  padding: 32rpx 24rpx;
+  margin-top: 32rpx;
+  border-radius: 16rpx;
+}
+.x-padding {
+  padding: 0 24rpx;
+}
+$height: 70rpx;
+.number-box {
+  font-size: 28rpx;
+  padding: 0 26rpx;
+  border-radius: 6rpx 0 0 6rpx;
+  border-top: 2rpx solid #d9d9d9;
+  border-bottom: 2rpx solid #d9d9d9;
+  border-left: 2rpx solid #d9d9d9;
+  background: #fff;
+  box-sizing: border-box;
+  height: $height;
+  flex: 1;
+  line-height: $height;
+  &.disabled {
+    background-color: #f7f7fa;
+    color: #999999;
+  }
+}
+.unit {
+  display: flex;
+  padding: 0 38rpx;
+  height: $height;
+  line-height: $height;
+  align-items: center;
+  border-radius: 0 6rpx 6rpx 0;
+  border: 2rpx solid #d9d9d9;
+  background: #f7f7fa;
+  font-size: 28rpx;
+  color: #999999;
+}
+
+.my-btn {
+  font-size: 28rpx;
+  line-height: 36rpx;
+  padding: 8rpx 32rpx;
+  border-radius: 12rpx;
+  margin: 0;
+}
+
+.edit-btn {
+  background: #e6f0ff;
+  color: $my-main-color;
+}
+
+.delete-btn {
+  background: #ffe7e6;
+  color: #ff1c1c;
+}
+.title {
+  font-weight: 700;
+  color: #333;
+  font-size: 28rpx;
+}
+.first {
+  border-bottom: 2rpx solid #e5e5e5;
+}
+.arrow {
+  transition: all 0.3s ease-in-out;
+  &.rotate {
+    transform: rotate(180deg);
+  }
+}
+.times {
+  padding: 10rpx 20rpx;
+  border: 1px solid #d9d9d9;
+  border-radius: 8rpx;
+  display: flex;
+  align-content: center;
+  justify-content: center;
+  flex-direction: column;
+}
+:deep(.times .u-select) {
+  display: flex;
+}
+</style>
diff --git a/pageMarket/superVip/vip-plans.vue b/pageMarket/superVip/vip-plans.vue
new file mode 100644
index 0000000..32fdcc8
--- /dev/null
+++ b/pageMarket/superVip/vip-plans.vue
@@ -0,0 +1,140 @@
+<template>
+  <view class="min-page bg-f7 u-font-28">
+    <view class="default-box-padding">
+      <view
+        v-for="(item, index) in superVipStore.config.configList"
+        class="u-m-b-56 default-box-radius bg-fff default-box-padding"
+      >
+        <view class="u-flex u-row-between">
+          <text class="u-font-32 font-bold color-000">{{ item.name }}</text>
+        </view>
+        <view class="u-m-t-22 color-666 u-font-32 u-flex">
+          <view class="u-flex-1">
+            <view>
+              <text class="color-666">价格：</text>
+              <text>{{item.price}}元</text>
+            </view>
+            <view class="u-m-t-20">
+              <text class="color-666">周期：</text>
+              <text> {{item.circleTime}}个{{ item.circleUnit }}</text>
+            </view>
+          </view>
+          <view class="u-flex-1">
+            <view>
+              <text class="color-666">赠送成长值：</text>
+              <text>{{item.reward}}</text>
+            </view>
+            <view class="u-m-t-20">
+              <text class="color-666">赠送优惠券：</text>
+              <text> {{returnCouponAllNum(item)}}张</text>
+            </view>
+          </view>
+        </view>
+        <view class="u-flex u-row-right gap-20 u-m-t-32">
+          <view class="btn del" @click="handleDelete(index)">删除</view>
+          <view class="btn edit" @click="handleEdit(item,index)">编辑</view>
+        </view>
+      </view>
+    </view>
+    <view style="height: 100rpx"></view>
+    <view class="fixed-bottom">
+      <my-button @click="go.to('PAGES_MARKET_SUPER_VIP_ADD_PLAN')">
+        <view class="u-flex">
+          <up-icon name="plus" color="#fff" size="12"></up-icon>
+          <text class="u-m-l-10">添加方案</text>
+        </view>
+      </my-button>
+    </view>
+  </view>
+</template>
+
+<script setup>
+import {
+  onLoad,
+  onReady,
+  onShow,
+  onPageScroll,
+  onReachBottom,
+  onBackPress,
+} from "@dcloudio/uni-app";
+import { useSuperVipStore } from "@/store/market.js";
+import go from "@/commons/utils/go.js";
+const superVipStore = useSuperVipStore();
+import { ref, reactive, onMounted } from "vue";
+
+function handleDelete(index) {
+  uni.showModal({
+    title: "确认删除吗？",
+    success: (res) => {
+      if (res.confirm) {
+        superVipStore.config.configList.splice(index, 1);
+        superVipStore.editConfig().then(res=>{
+          if(res){
+            uni.showToast({
+              title: "删除成功",
+              icon: "none",
+            });
+          }
+        })
+      }
+    },
+  });
+  
+}
+
+function returnCouponAllNum(item){
+    return (item.couponList||[]).reduce((pre,cur)=>pre+cur.num,0)
+}
+
+function handleEdit(item,index) {
+  uni.setStorageSync("suggestItem", item);
+  go.to("PAGES_MARKET_SUPER_VIP_ADD_PLAN", {
+    type: "edit",
+    index: index,
+  });
+}
+
+
+
+</script>
+
+<style lang="scss" scoped>
+.status {
+  padding: 8rpx 18rpx;
+  border: 2rpx solid transparent;
+  border-radius: 8rpx;
+  &.status1 {
+    background-color: rgba(123, 209, 54, 0.12);
+    border-color: rgba(123, 209, 54, 1);
+    color: #7bd136;
+  }
+  &.status0 {
+    border-color: rgba(153, 153, 153, 1);
+    background-color: rgba(153, 153, 153, 0.12);
+    color: #999;
+  }
+}
+.btn {
+  padding: 8rpx 42rpx;
+  border-radius: 100rpx;
+  &.del {
+    background-color: #f7f7fa;
+    color: #999;
+  }
+  &.edit {
+    background-color: $my-main-color;
+    color: #fff;
+  }
+}
+.fixed-bottom {
+  left: 70rpx;
+  right: 70rpx;
+}
+.time {
+  margin-left: 30rpx;
+  padding: 4rpx 20rpx;
+  border: 1px solid $my-main-color;
+  border-radius: 8rpx;
+  color: $my-main-color;
+}
+</style>
diff --git a/pageRecharge/components/recharge-item.vue b/pageRecharge/components/recharge-item.vue
index 6809d65..bf7fcf1 100644
--- a/pageRecharge/components/recharge-item.vue
+++ b/pageRecharge/components/recharge-item.vue
@@ -14,7 +14,7 @@
 			<text class="color-999">充值赠送</text>
 			<text class="u-m-l-16 color-333">{{props.data.desc}}</text>
 		</view>
-		<view class="u-flex u-row-right u-m-t-32 gap-20">
+		<view class="u-flex u-row-right u-m-t-32 gap-20" v-if="isCanEdit">
 			<view class="" style="width: 140rpx;">
 				<my-button plain height="56" type="cancel" shape="circle" @tap="del">删除</my-button>
 			</view>
@@ -40,6 +40,10 @@
 			default: () => {
 				return {}
 			}
+		},
+		isCanEdit:{
+			type:Boolean,
+			default:false
 		}
 	})
 	const emits=defineEmits(['del'])
diff --git a/pageRecharge/index.vue b/pageRecharge/index.vue
index 7bdd61b..6cf5489 100644
--- a/pageRecharge/index.vue
+++ b/pageRecharge/index.vue
@@ -17,7 +17,7 @@
 
 			<view class="u-p-30">
 				<view class="u-m-b-32" v-for="(item, index) in rechargeLists" :key="index">
-					<recharge-item @del="rechargeItemDel" :index="index" :data="item"></recharge-item>
+					<recharge-item @del="rechargeItemDel" :index="index" :data="item" :isCanEdit="isCanEdit"></recharge-item>
 				</view>
 			</view>
 		</template>
@@ -67,7 +67,7 @@
 						<my-switch v-model="mustBindPhone"></my-switch>
 					</view>
 				</view> -->
-				<view class="u-m-t-60" style="padding: 80rpx">
+				<view class="u-m-t-60" style="padding: 80rpx" v-if="isCanEdit">
 					<my-button showShadow shape="circle" @click="rechargeSetting">保存</my-button>
 				</view>
 			</view>
@@ -161,6 +161,14 @@ import $util from '@/commons/utils/getDateArea.js';
 import go from '@/commons/utils/go.js';
 import { shopRechargePost, shopRechargeGet } from '@/http/api/market/index.js';
 import { onLoad } from '@dcloudio/uni-app';
+import { isMainShop } from "@/store/account.js";
+
+const isCanEdit=computed(()=>{
+	return isMainShop()
+})
+
+
+
 
 const model = ref(null);
 const modelData = reactive({
diff --git a/pages.json b/pages.json
index 17b838e..084b837 100644
--- a/pages.json
+++ b/pages.json
@@ -785,6 +785,34 @@
 					"style": {
 						"navigationBarTitleText": "充值兑换码详情"
 					}
+				},
+				{
+					"pageId": "PAGES_MARKET_SUPER_VIP",
+					"path": "superVip/index",
+					"style": {
+						"navigationBarTitleText": "超级会员"
+					}
+				},
+				{
+					"pageId": "PAGES_MARKET_SUPER_VIP_ADD_PLAN",
+					"path": "superVip/add-plans",
+					"style": {
+						"navigationBarTitleText": "添加方案"
+					}
+				},
+				{
+					"pageId": "PAGES_MARKET_SUPER_VIP_VIP_PLANS",
+					"path": "superVip/vip-plans",
+					"style": {
+						"navigationBarTitleText": "会员周期列表"
+					}
+				},
+				{
+					"pageId": "PAGES_MARKET_SUPER_VIP_LV_ADD",
+					"path": "superVip/vip-lv-add",
+					"style": {
+						// "navigationBarTitleText": "添加会员等级"
+					}
 				}
 				
 
diff --git a/pages/appliccation/marketing.vue b/pages/appliccation/marketing.vue
index ea60459..403593d 100644
--- a/pages/appliccation/marketing.vue
+++ b/pages/appliccation/marketing.vue
@@ -52,7 +52,7 @@ const menuList = ref([
 			{
 				title: '超级会员',
 				icon: '',
-				pageUrl: 'PAGES_ORDER_INDEX',
+				pageUrl: 'PAGES_MARKET_SUPER_VIP',
 				intro: '用户会员管理设置'
 			},
 			{
diff --git a/pages/permission/permission.vue b/pages/permission/permission.vue
index b2568ef..d83b0eb 100644
--- a/pages/permission/permission.vue
+++ b/pages/permission/permission.vue
@@ -241,7 +241,7 @@
 	}
 
 	.u-tab-view {
-		width: 200rpx;
+		width: 240rpx;
 		height: 100%;
 	}
 
diff --git a/pages/shopSetUp/decoration.vue b/pages/shopSetUp/decoration.vue
index 7cde85d..5152a05 100644
--- a/pages/shopSetUp/decoration.vue
+++ b/pages/shopSetUp/decoration.vue
@@ -1,566 +1,582 @@
 <template>
-	<view class="page-wrapper">
-		<view class="page-cell column">
-			<view class="extendList">
-				<view class="extendTab">
-					<view class="extendTab_item" v-for="(item, index) in vdata.extendList" :key="index"
-						:class="{ active: vdata.extendIndex == index }" @click="extendTabClick(item, index)">
-						{{ item.name }}
-					</view>
-				</view>
-				<view class="extend_content">
-					<view class="extend_img">
-						<view class="u-flex">
-							<!-- <view class="extend_title">{{ vdata.extendInfo.name }}背景图片：</view> -->
-							<view class="extend_title">当前背景图片：</view>
-							<view class=" color-main u-font-28" @click="chooseAndUploadAvatar('extendUp')">更换</view>
-						</view>
-						<view class="fileUp u-m-t-24">
-							<up-image width="148rpx" height="148rpx" :src="vdata.extendInfo.value"></up-image>
-							<view class="file" @tap="chooseAndUploadAvatar('extendUp')"></view>
-						</view>
-					</view>
+  <view class="page-wrapper">
+    <view class="page-cell column">
+      <view class="extendList">
+        <view class="extendTab">
+          <view
+            class="extendTab_item"
+            v-for="(item, index) in vdata.extendList"
+            :key="index"
+            :class="{ active: vdata.extendIndex == index }"
+            @click="extendTabClick(item, index)"
+          >
+            {{ item.name }}
+          </view>
+        </view>
+        <view class="extend_content">
+          <view class="extend_img">
+            <view class="u-flex">
+              <!-- <view class="extend_title">{{ vdata.extendInfo.name }}背景图片：</view> -->
+              <view class="extend_title">当前背景图片：</view>
+              <view
+                class="color-main u-font-28"
+                @click="chooseAndUploadAvatar('extendUp')"
+                >更换</view
+              >
+            </view>
+            <view class="fileUp u-m-t-24">
+              <up-image
+                width="148rpx"
+                height="148rpx"
+                :src="vdata.extendInfo.value"
+              ></up-image>
+              <view
+                class="file"
+                @tap="chooseAndUploadAvatar('extendUp')"
+              ></view>
+            </view>
+          </view>
 
-					<view class="u-m-t-32 u-m-b-24">
-						<!-- <view class="extend_title">{{ vdata.extendInfo.name }}背景效果：</view> -->
-						<view class="extend_title">当前背景效果：</view>
-					</view>
-					<view class="u-flex " :class="['bg-'+vdata.extendIndex]" :style="{
-						backgroundImage:'url('+vdata.extendInfo.value+')'
-					}">
-						<image style="width: 100%;" :src="imgUrl" mode="widthFix"></image>
-						<image class="logo" v-if="vdata.extendIndex==4" :src="vdata.extendInfo.value" mode="widthFix"></image>
-					</view>
-				</view>
-			</view>
-		</view>
-		<!-- <view class="cutShop" @tap="go.to('PAGES_SHOP_LIST')">切换门店</view> -->
-	</view>
+          <view class="u-m-t-32 u-m-b-24">
+            <!-- <view class="extend_title">{{ vdata.extendInfo.name }}背景效果：</view> -->
+            <view class="extend_title">当前背景效果：</view>
+          </view>
+          <view
+            class="u-flex"
+            :class="['bg-' + vdata.extendIndex]"
+            :style="{
+              backgroundImage: 'url(' + vdata.extendInfo.value + ')',
+            }"
+          >
+            <image style="width: 100%" :src="imgUrl" mode="widthFix"></image>
+            <image
+              class="logo"
+              v-if="vdata.extendIndex == 4"
+              :src="vdata.extendInfo.value"
+              mode="widthFix"
+            ></image>
+          </view>
+        </view>
+      </view>
+    </view>
+    <!-- <view class="cutShop" @tap="go.to('PAGES_SHOP_LIST')">切换门店</view> -->
+  </view>
 </template>
 
 <script setup>
-	import {
-		ref,
-		reactive,
-		onMounted,
-		computed
-	} from 'vue';
-	import {
-		onShow
-	} from '@dcloudio/uni-app';
-	import go from '@/commons/utils/go.js';
-	import {
-		uploadFile
-	} from '@/http/api/index.js';
-	import {
-		getShopInfo,
-		editShopInfo,
-		getShopExtend,
-		editShopExtend
-	} from '@/http/api/shop.js';
+import { ref, reactive, onMounted, computed } from "vue";
+import { onShow } from "@dcloudio/uni-app";
+import go from "@/commons/utils/go.js";
+import { uploadFile } from "@/http/api/index.js";
+import {
+  getShopInfo,
+  editShopInfo,
+  getShopExtend,
+  editShopExtend,
+} from "@/http/api/shop.js";
 
+const vdata = reactive({
+  shopInfo: {
+    status: 2,
+    isAccountPay: 0,
+    isMemberPrice: 0,
+  },
+  extendList: [],
+  registerTypeList: [
+    {
+      name: "先付费",
+      value: "before",
+    },
+    {
+      name: "后付费",
+      value: "after",
+    },
+  ],
+  extendIndex: 0,
+  extendInfo: {},
+  dineIn: false,
+  takeout: false,
+  isTableFee: false,
+  label: "",
+  type: "",
+  inputValue: "",
+});
+onMounted(() => {
+  shopExtend();
+});
 
-	const vdata = reactive({
-		shopInfo: {
-			status: 2,
-			isAccountPay: 0,
-			isMemberPrice: 0
-		},
-		extendList: [],
-		registerTypeList: [{
-				name: '先付费',
-				value: 'before'
-			},
-			{
-				name: '后付费',
-				value: 'after'
-			}
-		],
-		extendIndex: 0,
-		extendInfo: {},
-		dineIn: false,
-		takeout: false,
-		isTableFee: false,
-		label: '',
-		type: '',
-		inputValue: ''
-	});
-	onMounted(() => {
-		shopExtend();
-	});
+onShow(() => {
+  shopInfo();
+  uni.$on("refreshPreviousPage", (params) => {
+    // 这里执行刷新数据的操作，例如重新调用API获取数据
+    refreshData(params);
+  });
+});
 
-	onShow(() => {
-		shopInfo();
-		uni.$on('refreshPreviousPage', (params) => {
-			// 这里执行刷新数据的操作，例如重新调用API获取数据
-			refreshData(params);
-		});
-	});
+/**
+ * 输入内容修改
+ */
+let refreshData = (e) => {
+  let params = {
+    id: vdata.shopInfo.id,
+  };
+  params[e.name] = e.value;
+  vdata.type = e.name;
+  vdata.inputValue = e.value;
+  updateShopInfo(params, "input");
+};
 
-	/**
-	 * 输入内容修改
-	 */
-	let refreshData = (e) => {
-		let params = {
-			id: vdata.shopInfo.id
-		};
-		params[e.name] = e.value;
-		vdata.type = e.name;
-		vdata.inputValue = e.value;
-		updateShopInfo(params, 'input');
-	};
+/**
+ * 获取店铺信息
+ */
+const shopInfo = () => {
+  getShopInfo({
+    id: uni.getStorageSync("shopInfo").id,
+  }).then((res) => {
+    vdata.isTableFee = res.isTableFee == 1 ? true : false;
+    if (res.eatModel.split(",").indexOf("dine-in") != -1) {
+      vdata.dineIn = true;
+    }
+    if (res.eatModel.split(",").indexOf("take-out") != -1) {
+      vdata.takeout = true;
+    }
+    vdata.shopInfo = res;
+  });
+};
 
-	/**
-	 * 获取店铺信息
-	 */
-	const shopInfo = () => {
-		getShopInfo({
-			id: uni.getStorageSync('shopInfo').id
-		}).then((res) => {
-			vdata.isTableFee = res.isTableFee == 1 ? true : false;
-			if (res.eatModel.split(',').indexOf('dine-in') != -1) {
-				vdata.dineIn = true;
-			}
-			if (res.eatModel.split(',').indexOf('take-out') != -1) {
-				vdata.takeout = true;
-			}
-			vdata.shopInfo = res;
-		});
-	};
+/**
+ * 获取店铺图片
+ */
+let shopExtend = () => {
+  getShopExtend().then((res) => {
+    if (res && res.length > 0) {
+      vdata.extendList = res;
+      vdata.extendIndex = 0;
+      vdata.extendInfo = res[0];
+    }
+  });
+};
 
-	/**
-	 * 获取店铺图片
-	 */
-	let shopExtend = () => {
-		getShopExtend().then((res) => {
-			if (res && res.length > 0) {
-				vdata.extendList = res;
-				vdata.extendIndex = 0;
-				vdata.extendInfo = res[0];
-			}
-		});
-	};
+// 台桌清理模式修改
+function tableClearChange(n) {
+  let params = {
+    id: vdata.shopInfo.id,
+    tableClearType: n,
+  };
+  updateShopInfo(params);
+}
 
-	// 台桌清理模式修改
-	function tableClearChange(n) {
-		let params = {
-			id: vdata.shopInfo.id,
-			tableClearType: n
-		};
-		updateShopInfo(params);
-	}
+/**
+ * 付费模式修改
+ */
+let radioChange = (n) => {
+  let params = {
+    id: vdata.shopInfo.id,
+    registerType: n,
+  };
+  updateShopInfo(params);
+};
 
-	/**
-	 * 付费模式修改
-	 */
-	let radioChange = (n) => {
-		let params = {
-			id: vdata.shopInfo.id,
-			registerType: n
-		};
-		updateShopInfo(params);
-	};
+/**
+ * 修改
+ */
+let updateShopInfo = (params, type) => {
+  editShopInfo(params).then((res) => {
+    if (type && type == "input") {
+      vdata.shopInfo[vdata.type] = vdata.inputValue;
+    }
+  });
+};
 
-	/**
-	 * 修改
-	 */
-	let updateShopInfo = (params, type) => {
-		editShopInfo(params).then((res) => {
-			if (type && type == 'input') {
-				vdata.shopInfo[vdata.type] = vdata.inputValue;
-			}
-		});
-	};
+/**
+ * 修改店铺图片
+ */
+let updateShopExtend = () => {
+  editShopExtend({
+    autokey: vdata.extendInfo.autoKey,
+    value: vdata.extendInfo.value,
+  }).then((res) => {});
+};
 
-	/**
-	 * 修改店铺图片
-	 */
-	let updateShopExtend = () => {
-		editShopExtend({
-			autokey: vdata.extendInfo.autoKey,
-			value: vdata.extendInfo.value
-		}).then((res) => {});
-	};
+/**
+ * 上传头像
+ */
+let chooseAndUploadAvatar = (type) => {
+  // 选择图片
+  uni.chooseImage({
+    count: 1, // 默认为1，只选择一张图片
+    sizeType: ["original", "compressed"], // 图片质量，原图或压缩
+    sourceType: ["album", "camera"], // 图片来源，相册或相机
+    success: (res) => {
+      let file = res.tempFiles[0];
+      uploadFile(file)
+        .then((res) => {
+          if (type == "coverImg") {
+            vdata.shopInfo.coverImg = res;
+            let params = {
+              id: vdata.shopInfo.id,
+              coverImg: vdata.shopInfo.coverImg,
+            };
+            updateShopInfo(params);
+          }
+          if (type == "extendUp") {
+            vdata.extendInfo.value = res;
+            updateShopExtend();
+          }
+        })
+        .catch((res) => {
+          if (res.errMsg) {
+            uni.showToast({
+              title: "图片大小超出限制",
+              icon: "error",
+            });
+          }
+        });
+    },
+    fail: (chooseImageError) => {
+      // 选择图片失败处理逻辑
+      console.log("choose image fail:", chooseImageError);
+    },
+  });
+};
 
-	/**
-	 * 上传头像
-	 */
-	let chooseAndUploadAvatar = (type) => {
-		// 选择图片
-		uni.chooseImage({
-			count: 1, // 默认为1，只选择一张图片
-			sizeType: ['original', 'compressed'], // 图片质量，原图或压缩
-			sourceType: ['album', 'camera'], // 图片来源，相册或相机
-			success: (res) => {
-				let file = res.tempFiles[0];
-				uploadFile(file)
-					.then((res) => {
-						if (type == 'coverImg') {
-							vdata.shopInfo.coverImg = res;
-							let params = {
-								id: vdata.shopInfo.id,
-								coverImg: vdata.shopInfo.coverImg
-							};
-							updateShopInfo(params);
-						}
-						if (type == 'extendUp') {
-							vdata.extendInfo.value = res;
-							updateShopExtend();
-						}
-					})
-					.catch((res) => {
-						if (res.errMsg) {
-							uni.showToast({
-								title: '图片大小超出限制',
-								icon: 'error'
-							});
-						}
-					});
-			},
-			fail: (chooseImageError) => {
-				// 选择图片失败处理逻辑
-				console.log('choose image fail:', chooseImageError);
-			}
-		});
-	};
+/**
+ * 店铺图片TAB切换
+ */
+let extendTabClick = (item, index) => {
+  vdata.extendInfo = item;
+  vdata.extendIndex = index;
+};
 
-	/**
-	 * 店铺图片TAB切换
-	 */
-	let extendTabClick = (item, index) => {
-		vdata.extendInfo = item;
-		vdata.extendIndex = index;
-	};
+/**
+ * 修改
+ */
+let switchChange = (type) => {
+  let params = {
+    id: vdata.shopInfo.id,
+  };
+  switch (type) {
+    case "address":
+      params.lng = vdata.shopInfo.lng;
+      params.lat = vdata.shopInfo.lat;
+      params.address = vdata.shopInfo.address;
+      break;
+    case "status":
+      params.status = vdata.shopInfo.status;
+      break;
+    case "eatModel":
+      params.eatModel = [];
+      if (vdata.dineIn) {
+        params.eatModel.push("dine-in");
+      }
+      if (vdata.takeout) {
+        params.eatModel.push("take-out");
+      }
+      params.eatModel = params.eatModel.join(",");
+      break;
+    case "isAccountPay":
+      params.isAccountPay = vdata.shopInfo.isAccountPay;
+      break;
+    case "isMemberPrice":
+      params.isMemberPrice = vdata.shopInfo.isMemberPrice;
+      break;
+    case "isTableFee":
+      if (vdata.isTableFee) {
+        params.isTableFee = 1;
+      } else {
+        params.isTableFee = 0;
+      }
+      break;
+  }
+  updateShopInfo(params);
+};
 
-
-
-	/**
-	 * 修改
-	 */
-	let switchChange = (type) => {
-		let params = {
-			id: vdata.shopInfo.id
-		};
-		switch (type) {
-			case 'address':
-				params.lng = vdata.shopInfo.lng;
-				params.lat = vdata.shopInfo.lat;
-				params.address = vdata.shopInfo.address;
-				break;
-			case 'status':
-				params.status = vdata.shopInfo.status;
-				break;
-			case 'eatModel':
-				params.eatModel = [];
-				if (vdata.dineIn) {
-					params.eatModel.push('dine-in');
-				}
-				if (vdata.takeout) {
-					params.eatModel.push('take-out');
-				}
-				params.eatModel = params.eatModel.join(',');
-				break;
-			case 'isAccountPay':
-				params.isAccountPay = vdata.shopInfo.isAccountPay;
-				break;
-			case 'isMemberPrice':
-				params.isMemberPrice = vdata.shopInfo.isMemberPrice;
-				break;
-			case 'isTableFee':
-				if (vdata.isTableFee) {
-					params.isTableFee = 1;
-				} else {
-					params.isTableFee = 0;
-				}
-				break;
-		}
-		updateShopInfo(params);
-	};
-
-	const imgUrl = computed(() => {
-		if(vdata.extendIndex==2){
-			return '/static/member_bg.png'
-		}
-		return 'https://czg-qr-order.oss-cn-beijing.aliyuncs.com/cashier_admin_app_shopSet/' + vdata.extendInfo
-			.autoKey + '.png'
-	})
+const imgUrl = computed(() => {
+  if (vdata.extendIndex == 2) {
+    return "https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/2/852ace0de85244fcb6524d7aa41034f1.png";
+  }
+  return (
+    "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/cashier_admin_app_shopSet/" +
+    vdata.extendInfo.autoKey +
+    ".png"
+  );
+});
 </script>
 
 <style lang="scss" scoped>
-	.page-wrapper {
-		background-color: #f8f8f8;
-		padding-bottom: 32rpx;
+.page-wrapper {
+  background-color: #f8f8f8;
+  padding-bottom: 32rpx;
 
-		.page-cell {
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-			box-sizing: border-box;
+  .page-cell {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    box-sizing: border-box;
 
-			.label {
-				font-weight: bold;
-				font-size: 28rpx;
-				color: #333333;
-				display: flex;
-				align-items: center;
-				flex-shrink: 0;
-				margin-right: 20rpx;
+    .label {
+      font-weight: bold;
+      font-size: 28rpx;
+      color: #333333;
+      display: flex;
+      align-items: center;
+      flex-shrink: 0;
+      margin-right: 20rpx;
 
-				.tableFee {
-					width: 186rpx;
-					height: 54rpx;
-					line-height: 54rpx;
-					margin-left: 10rpx;
-					font-size: 28rpx;
-					color: #333;
-					border-radius: 8rpx 8rpx 8rpx 8rpx;
-					border: 2rpx solid #e5e5e5;
-					text-align: left;
-					padding: 0 18rpx;
-					box-sizing: border-box;
-				}
-			}
+      .tableFee {
+        width: 186rpx;
+        height: 54rpx;
+        line-height: 54rpx;
+        margin-left: 10rpx;
+        font-size: 28rpx;
+        color: #333;
+        border-radius: 8rpx 8rpx 8rpx 8rpx;
+        border: 2rpx solid #e5e5e5;
+        text-align: left;
+        padding: 0 18rpx;
+        box-sizing: border-box;
+      }
+    }
 
-			.extendList {
-				width: 100%;
-				display: flex;
-				flex-direction: column;
+    .extendList {
+      width: 100%;
+      display: flex;
+      flex-direction: column;
 
-				.extendTab {
-					display: flex;
-					justify-content: flex-start;
-					background-color: #fff;
-					padding: 32rpx 28rpx;
+      .extendTab {
+        display: flex;
+        justify-content: flex-start;
+        background-color: #fff;
+        padding: 32rpx 28rpx;
 
-					.extendTab_item {
-						font-size: 24rpx;
-						font-weight: 400;
-						padding: 4rpx 12rpx;
-						border-radius: 4rpx;
-						border: 2rpx solid #e5e5e5;
-						margin-right: 20rpx;
-					}
+        .extendTab_item {
+          font-size: 24rpx;
+          font-weight: 400;
+          padding: 4rpx 12rpx;
+          border-radius: 4rpx;
+          border: 2rpx solid #e5e5e5;
+          margin-right: 20rpx;
+        }
 
-					.active {
-						background: #318afe;
-						border: 2rpx solid #318afe;
-						color: #fff;
-					}
-				}
+        .active {
+          background: #318afe;
+          border: 2rpx solid #318afe;
+          color: #fff;
+        }
+      }
 
-				.extend_content {
-					margin-top: 32rpx;
-					margin: 32rpx 28rpx;
-					padding: 32rpx 28rpx;
-					background: #FFFFFF;
-					border-radius: 18rpx 18rpx 18rpx 18rpx;
+      .extend_content {
+        margin-top: 32rpx;
+        margin: 32rpx 28rpx;
+        padding: 32rpx 28rpx;
+        background: #ffffff;
+        border-radius: 18rpx 18rpx 18rpx 18rpx;
 
-					.preview {
-						min-width: 146rpx;
-						height: 342rpx;
-						position: relative;
-						margin-right: 32rpx;
-						background-color: #f7f7f7;
+        .preview {
+          min-width: 146rpx;
+          height: 342rpx;
+          position: relative;
+          margin-right: 32rpx;
+          background-color: #f7f7f7;
 
-						::v-deep .bg,
-						::v-deep .bg .u-image,
-						::v-deep .bg .u-image__image {
-							width: 146rpx !important;
-							height: 342rpx !important;
-							position: absolute;
-							top: 0;
-						}
+          ::v-deep .bg,
+          ::v-deep .bg .u-image,
+          ::v-deep .bg .u-image__image {
+            width: 146rpx !important;
+            height: 342rpx !important;
+            position: absolute;
+            top: 0;
+          }
 
-						::v-deep .index_bg .u-image,
-						::v-deep .index_bg .u-image__image {
-							width: 146rpx !important;
-							height: 242rpx !important;
-							position: absolute;
-							top: 0;
-						}
+          ::v-deep .index_bg .u-image,
+          ::v-deep .index_bg .u-image__image {
+            width: 146rpx !important;
+            height: 242rpx !important;
+            position: absolute;
+            top: 0;
+          }
 
-						::v-deep .my_bg .u-image,
-						::v-deep .my_bg .u-image__image {
-							width: 146rpx !important;
-							height: 90rpx !important;
-							position: absolute;
-							top: 0;
-						}
+          ::v-deep .my_bg .u-image,
+          ::v-deep .my_bg .u-image__image {
+            width: 146rpx !important;
+            height: 90rpx !important;
+            position: absolute;
+            top: 0;
+          }
 
-						::v-deep .member_bg .u-image,
-						::v-deep .member_bg .u-image__image {
-							width: 34rpx !important;
-							height: 63rpx !important;
-							position: absolute;
-							top: 22rpx;
-							left: 0;
-							right: 0;
-							margin: auto;
-							border-radius: 5rpx !important;
-						}
+          ::v-deep .member_bg .u-image,
+          ::v-deep .member_bg .u-image__image {
+            width: 34rpx !important;
+            height: 63rpx !important;
+            position: absolute;
+            top: 22rpx;
+            left: 0;
+            right: 0;
+            margin: auto;
+            border-radius: 5rpx !important;
+          }
 
-						::v-deep .shopinfo_bg .u-image,
-						::v-deep .shopinfo_bg .u-image__image {
-							width: 146rpx !important;
-							height: 50rpx !important;
-							position: absolute;
-							top: 0;
-						}
+          ::v-deep .shopinfo_bg .u-image,
+          ::v-deep .shopinfo_bg .u-image__image {
+            width: 146rpx !important;
+            height: 50rpx !important;
+            position: absolute;
+            top: 0;
+          }
 
-						::v-deep .bg.ticket_logo,
-						::v-deep .bg.ticket_logo .u-image,
-						::v-deep .bg.ticket_logo .u-image__image {
-							width: 359rpx !important;
-							height: 232rpx !important;
-							position: absolute;
-							top: 0;
-						}
+          ::v-deep .bg.ticket_logo,
+          ::v-deep .bg.ticket_logo .u-image,
+          ::v-deep .bg.ticket_logo .u-image__image {
+            width: 359rpx !important;
+            height: 232rpx !important;
+            position: absolute;
+            top: 0;
+          }
 
-						::v-deep .ticket_logo.img .u-image,
-						::v-deep .ticket_logo.img .u-image__image {
-							width: 146rpx !important;
-							height: 50rpx !important;
-							position: absolute;
-							top: 0;
-							left: 10rpx;
-						}
+          ::v-deep .ticket_logo.img .u-image,
+          ::v-deep .ticket_logo.img .u-image__image {
+            width: 146rpx !important;
+            height: 50rpx !important;
+            position: absolute;
+            top: 0;
+            left: 10rpx;
+          }
 
-						.shopinfo_bg_f {
-							width: 146rpx;
-							height: 290rpx;
-							position: absolute;
-							bottom: 0;
-							background-color: #fff;
-						}
-					}
+          .shopinfo_bg_f {
+            width: 146rpx;
+            height: 290rpx;
+            position: absolute;
+            bottom: 0;
+            background-color: #fff;
+          }
+        }
 
-					.extend_img {
-						display: flex;
-						flex-direction: column;
+        .extend_img {
+          display: flex;
+          flex-direction: column;
 
-						.extend_title {
-							font-weight: 700;
-							font-size: 28rpx;
-							color: #333333;
-						}
+          .extend_title {
+            font-weight: 700;
+            font-size: 28rpx;
+            color: #333333;
+          }
 
-						.fileUp {
-							width: 148rpx;
-							height: 148rpx;
-							position: relative;
+          .fileUp {
+            width: 148rpx;
+            height: 148rpx;
+            position: relative;
 
-							.file {
-								width: 148rpx;
-								height: 148rpx;
-								position: absolute;
-								top: 0;
-							}
-						}
+            .file {
+              width: 148rpx;
+              height: 148rpx;
+              position: absolute;
+              top: 0;
+            }
+          }
 
-						::v-deep .u-image,
-						::v-deep .u-image__image {
-							width: 148rpx !important;
-							height: 148rpx !important;
-						}
-					}
-				}
-			}
-		}
+          ::v-deep .u-image,
+          ::v-deep .u-image__image {
+            width: 148rpx !important;
+            height: 148rpx !important;
+          }
+        }
+      }
+    }
+  }
 
-		.column {
-			flex-direction: column;
+  .column {
+    flex-direction: column;
 
-			.label {
-				align-self: flex-start;
-			}
-		}
+    .label {
+      align-self: flex-start;
+    }
+  }
 
-		.m {
-			margin-bottom: 12rpx;
-		}
+  .m {
+    margin-bottom: 12rpx;
+  }
 
-		.cutShop {
-			width: 530rpx;
-			height: 80rpx;
-			line-height: 80rpx;
-			background: #318afe;
-			border-radius: 56rpx;
-			font-weight: 500;
-			font-size: 32rpx;
-			color: #ffffff;
-			margin: 48rpx auto 0 auto;
-			text-align: center;
-		}
+  .cutShop {
+    width: 530rpx;
+    height: 80rpx;
+    line-height: 80rpx;
+    background: #318afe;
+    border-radius: 56rpx;
+    font-weight: 500;
+    font-size: 32rpx;
+    color: #ffffff;
+    margin: 48rpx auto 0 auto;
+    text-align: center;
+  }
 
-		.right {
-			display: flex;
-			align-items: center;
-			font-weight: 400;
-			font-size: 28rpx;
-			color: #999999;
-			position: relative;
+  .right {
+    display: flex;
+    align-items: center;
+    font-weight: 400;
+    font-size: 28rpx;
+    color: #999999;
+    position: relative;
 
-			.file {
-				width: 112rpx;
-				height: 112rpx;
-				line-height: 112rpx;
-				position: absolute;
-				top: 0;
-				bottom: 0;
-				right: 0;
-				margin: auto;
-			}
+    .file {
+      width: 112rpx;
+      height: 112rpx;
+      line-height: 112rpx;
+      position: absolute;
+      top: 0;
+      bottom: 0;
+      right: 0;
+      margin: auto;
+    }
 
-			.fileImg {
-				width: 112rpx !important;
-				height: 112rpx !important;
+    .fileImg {
+      width: 112rpx !important;
+      height: 112rpx !important;
 
-				::v-deep .u-avatar__image {
-					width: 112rpx !important;
-					height: 112rpx !important;
-				}
-			}
-		}
-	}
+      ::v-deep .u-avatar__image {
+        width: 112rpx !important;
+        height: 112rpx !important;
+      }
+    }
+  }
+}
 
-	.bg-cover {
-		background-size: cover;
-		background-position: center;
-	}
+.bg-cover {
+  background-size: cover;
+  background-position: center;
+}
 
-	.bg-0 {
-		background-size: cover;
-	}
+.bg-0 {
+  background-size: cover;
+}
 
-	.bg-1 {
-		background-repeat: no-repeat;
-		background-position: top;
-		background-size: 100% auto;
-	}
+.bg-1 {
+  background-repeat: no-repeat;
+  background-position: top;
+  background-size: 100% auto;
+}
 
-	.bg-2 {
-		background-position: center;
-		background-size: cover;
-		border-radius: 24rpx;
-		overflow: hidden;
-	}
-	.bg-3{
-		background-repeat: no-repeat;
-		background-position: top ;
-		background-size: 100% auto;
-	}
-	.bg-4{
-		background-repeat: no-repeat;
-		background-position: top ;
-		background-size: 100% auto;
-		position: relative;
-		.logo{
-			position: absolute;
-			left: 30rpx;
-			width: 90px;
-			height: 30px;
-			top: 30rpx;
-		}
-	}
-	
-</style>
\ No newline at end of file
+.bg-2 {
+  background-position: center;
+  background-size: cover;
+  border-radius: 24rpx;
+  overflow: hidden;
+}
+.bg-3 {
+  background-repeat: no-repeat;
+  background-position: top;
+  background-size: 100% auto;
+}
+.bg-4 {
+  background-repeat: no-repeat;
+  background-position: top;
+  background-size: 100% auto;
+  position: relative;
+  .logo {
+    position: absolute;
+    left: 30rpx;
+    width: 90px;
+    height: 30px;
+    top: 30rpx;
+  }
+}
+</style>
diff --git a/static/applocation/birthdayGift.png b/static/applocation/birthdayGift.png
deleted file mode 100644
index 6abda3eb809c94e6c72faa09950d9db072a9bd1b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3323
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
FV1lY~Pvrmr

diff --git a/static/applocation/bwc.png b/static/applocation/bwc.png
deleted file mode 100644
index 35ce698cc508c8440d58e90448824465f94c90f8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1444
zcmV;V1zY-wP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000G9Nkl<ZcmeF$
zKWrUE5C-t^E1*eXK@%FFFby<z1C3EE(F6&J6hT6wu_ekBDN|5Vq=O<Q!fB9@hy;<4
zNQ1D18)%XS8e9Y_H-IHvrFq=%9YfaV`}2IZB_4{Ex!s$co%z1m*}c1$NmPFu+tU{>
zZBM_u^y&1^N~ZsL*`9t0a|JynI@4*~k7;Z~#Bwac-!!hk47(NhsKUG$z$>7|zvXGf
z_M~ERrBE(bcN(i!V6i|SMZ3J{1mX#SqbvIOZuMfs*Y8E#cs=66Q;+p$-8=OPw1K<&
zO2o%+#tiu7m55K?j<|T?tfANbPDS9uH|i_{DAT}RdoAMHtF`kxKSk^x#ti)D??haE
zx$YxVN^L#vI+_3g>(AFgSDuLg9tj|6Z~YK)>&J+9zlcDD4mm`cVy^KqGMd2VS{?4*
zFA>+jslZl%cYll6`=h?U^K(7!ipb6H>oF@*it)=YxsH=j1Y|$6cKboZgZ(PY72prP
zjd=fVecyz0Z?7J+A}MSSA4S;kq&a7v`x6roNU3lx`?9G&Mu0ENi|>>AnTvpvM#-pM
zr%MJZ%jBei)1D7R>?6L#kRYp^Hht|N0pK~^T#eajBG~Qw_2yLXea`0@<4-BsBUTe|
z<tZjoLp}xxaDar?W_|0k2z4(QU7OgH9%8vtZ8oKjFMGt^5Cf@lystk<fHMI&$yUEh
zfWNU`Kg47ciBjmg=F&S5GGX(q@E`$B)6vk93JknCL@lf9Qt}~ZyiJmz#I=n#b#oEe
z|Er#s&g;A5S3y0%?2%GDAJV$)r><->MkcKsYwOQN;KI}OR2i;&-B+iIJ(2>j5;DU^
zRqOg)k_58tvP=CS0Ve`Ed=$|a+zXtNX^Qee-2Pd8E@p41Y?4$0$rfR@2srst-_`aK
zm^u09l|gB6+~r7ZBia<;&Ecy#M&A@=Xr<^S#XS8k=_TOd#epYoU-r|v6U0%Nvioa2
z;uRxxj>%fvedR|?<gHe>W%PfM<=ZBQeNJ*r!0gZ3rP+1%T~PPtzh+Dc?3>lQ0!|W>
zy#^lxXP_aDSx?ZEOn@w=&YoyYJ9Z1S)i;nB^xLGDfD=U~fKP{QPUr+uW+`;UahSSh
zYrIXwLP8mt(`J*pUIL8%-B8unlnm3giDQ#3$#LNA1M}!hk(jhATdQWXJ23bx$J+XX
z1ULeuZE~AVxd32}4J(rfXxr?&bbG(Y>~pkhJoSSF7y_ULO4}t(@Q%bT+b(^^Sb4U~
z;;4R*KxWQL9G!afZV0?hyt5UN;yx2oddfKB+I!_#TYqi>CU-qOb4*<;n=<p6Q8uLj
zSK8&67^!EI`mT16Ksu8VM<7w-O@|&-P4H}-WE<NNP4Qik*#^|f;~Rp1_ZgRuJ{cq+
zgTVQA6;Othi)TZh<9Wv<MmcS+*544~d2JC>ydgh>1UTTxPa~W<3hDg*Be?!)MCN52
za4YEZ(yE==3N*oauviWH)2@O9SW&*bFWE!-Cy}{Upy|*9Mut3eQmhC<er^P;IR{W<
zY}mSAf1&=N0C20^oHNh;C<4IeDgZ?i7(#w4EjPN?Vw=+#@NC_C1qaeAgLaIJA|Q}D
zl{I8!P-)qGz^G{(U4558k!Itg#T;|_Fqh9UGMa$kHnro>=Ciqxy185Z>{9)11dNkK
zsjy|^AYh~3-J8n?+p#j5Kwm(6#AzbCGOe%en=^LoTnGT;Sd?9vMuhG><a`L62ht9o
z{|f>K9pn~5J&C2L{)-|O@~`^M;O?ZlRB!3Ah^uf=CI9+lXKU%<(o(Ed@>MLx-$8|S
yr;@dut)+*50{{U3|2*{PegFUf21!IgR09C;V0(kWsl-kI0000<MNUMnLSTX%&%+P^

diff --git a/static/applocation/cjhy.png b/static/applocation/cjhy.png
deleted file mode 100644
index 3cd04663d3b77548574520dc3f66287b529616c1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 900
zcmV-~1AF|5P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0009yNkl<ZcmeE~
zA#4;u6o&s@fvUKmstBSOFn0z8=_QzwkWf()WG_J?DiKIT9f(T8)sT?T1gfYZT*4VJ
ztpP(tK~=$tD$Ft;n@P95c6WAfX4`FUbN}w_%*}iM|K7~(?8Y)jx1U^{?<b$;UnPGG
zl5>xK@(#|1x?&1RqHQJWN@}SIN1{bI!<`H~H=LV6+z`$DT8Y$;jgrMoWwVNj+GL<v
zq>r*~HC=$F0*+?1{<~=gi22MVY3{Prp5?AyOq_wG8`7Hx(#!kOi@Rxgxg*Wa)FWgf
z0Sj}|<C_v0uyi55+)l+jxvk(rDhv2e)I=KM!=KW<*V4nc($)`Y{~#rfK(Z53NM!+b
zm_T;zt90-;CB8b8Rz66ppVNB;h7?js0MUmO<kq(jiE<ARwY8gO<Rl@?6<-s+v;fF6
zBp_;|4w=({7(^h5K7jusf{9NcxCg9cw3mUi030x$0cD&pc_HEgh|(tu2ont3A3@l^
zbtU_+{IZh(qK*@;`Q|2X#mBQdk_}RkMJEA72}2BrN1IZ&9|qXQ2fkP&xE8@lfQ<%Y
zdG~jb$?EOcUi*^vXLzNh{IipQd=q|KSs1X${Nh@K5(0`$olUz}0ql!dNtlSo<xs~$
z;5xRC_do64s{oct#_rPfad!}BE|pm#$E}Rlcoo2&2p0?2#y5C~qiy3GXMgZ2VB>qb
zCt?C-vw$EdvqWZ}$ka^=uL4*>Y=oH)2!WuDzReJIzTi~=q_SCnIA8+XHm*M5T>x3&
zodA+#fyqmmI))HspYSdKa(0{(c|hIz4rl)eB7iNy&i*0UP|?Rj5CItGMTaY}8KLYO
z!32;2HfDgbZ{pToFabDVMFNyVp_Bl-u7@I1#jcY8I|Nt~?W$76Sy3Ns+m|Qnv#5`g
z06QVssPWD^=t&`fZA3uY`lOr(Cjms`>BsTUCwYdew(%gu7d~BVI0?Ye@K^eshmTgF
zz&kNt`0#~K7dQ*B#)wQP@Bp-aT(6}CxEikOe^UV`M!Lqz3z30QjREuSDpsUGJ9Py=
zB55-=C-YoY6SFWf!C#37y=X6r)G>IkW*j5KbzsmL^rF3g00030|CSGdDF6Tf21!Ig
aR09BYXUBAO$P&o_0000<MNUMnLSTY93Y7Bz

diff --git a/static/applocation/czdhm.png b/static/applocation/czdhm.png
deleted file mode 100644
index e9b2aea75f9ea2d5be1a0c584995e11377c1dff4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 957
zcmV;u148_XP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000AWNkl<ZcmeE~
zA#4;u6o&s@fvRXwbs&l<=FWhDv<aptDoTRvCCG|O1QLM*QAs!?2_#TO4dD_Ln4ZE=
zQAZV=sKPAsF_~n$x!Kvd+r8^Hce!^v^XBcF|9@|G=Iy02pN)QYeZ8N3S%01VF_K+)
z>1Q9nY@jQpk!3nkrVUBUYQrbf7MQ_K23{D<?Er3o=Dy3B)K3kQt(>x5%}gCK&@RyD
z(Jr^0fEEPKXLR<xsWPy#B<*yiR}ZAO52cs)rQO>S`XUu{j8(BM-don6n85Z;3w)<z
z-JhP>>-L%@12L<Su!SIF=&)V7V)Sd)*6A6Gm5B%dX!n)`kVo&N#|P5hCoA-arxL^f
z1`%x0G3IQ!(m(#K|5?K}7CiRR1Xv1826#Yo#gP;G=m89PhyW5DW6q8%ee{fDOIFaw
zNHl@Yie2N+ze;C+{ZqX;k{qC?pZ#|D*#Bm2H&^|3zL97Gcdl9BMA+vPJ>x`}=yFBp
z6Ko-}devv)*9Qr(-gy9>kO3m=`ej$_099t=#<1PIVIOLA>{cu*KXf}1B)|iRbE1e4
zQ6fe=Br&%5M4V6N<oU5M{l7s1+<N%a?l3%Xvy$O2W)4dw0<6!ltNB<|A}}9l)n;7~
zs1~Q@tRgZ{F9=R_w#!KluRM~u5CA-tD_bR7Z5~i;yAlB=igoO>&x2=6o(Ta?NFwHh
zy50w{Oz#7a{@FeIKH=t|WGVCI#)283C?iTtLK(r0`HWC1R9VN|4>;~EMxJwq@w}j;
z$YZ`T2@@FFQ<&2jM@&v7N*kfHesb5;|K`n%{x|`c4?OmOb?*nfBRF~ggVAyc5-7i2
z+W#(*A?lWK#a9S?(LWg_OGUk}KQ#fOM^?s>aNwDo2xCLrCjh4kC96K0qJC-uI2=d9
zfd>>XG*p?`mI=0H<KxC^A%No|2_gv~mmO@HklF|UE>D7f)8Lt-RsuML1nZrhB(&zS
zpH^xo-~d6ywVS*)MxaU1dEW~H`Do0e9i0K{9%`bdBsK_@3AlrZx`(=^3Bfl6++4In
zQklTvu`TM@+nW@&VCD(|cjJ`_a07olH7&7cM-%}_Tr_EhzzkVl3Id}U2CVj}QYA7k
zjcVm5kq%Px(=+JXn1zuE{$4uhB_~Ouu91(1NE^N*gLPn}JLn}R{{R30|NqhZwJ!hw
f00v1!K~w_(@Fhos#S8M900000NkvXXu0mjfO0=@<

diff --git a/static/applocation/czhd.png b/static/applocation/czhd.png
deleted file mode 100644
index 94f7b7a9e4ce53cf22a3f752645c1cdb817c4ebb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 805
zcmV+=1KRwFP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0008oNkl<ZcmeE~
zt#1@T7{;Gn0p`R7Ofdv;7%+DR45TMZLPAAJNHDzwSy74L55R$_BwP&%2~D602~}_j
zHDFo;hKho!f)iDkWqxcX-Md_RJ2TsXg}dA{yYq4HJkR^S^U<a<pKd?9FyGJK%|Fe4
z7-WAv`q@i38|q4V$ujLIQ&&<`b@*gjgfrZUz$3%C9>fjN!nc`8{nRK~EHu{ZHB*}i
z)Qj{e+h*MbXeMAZqVa392*mgK=#2kg1RAHLxrQpis4x9$P7zqRC_TSjEpUb(_54>(
z0+!nn5y*cUUP6B9QkWel0Zhnrt8b(`FT$|#2}|J)aT1VEDIFY!<M5}o7WVWKaR0jW
z_(m95Pf%~4la@RFk?<1Go|8gh(~&1@%Xck!2_S#hccdz?{f#(CHX?bgeCa3Pvmw7*
z4Yt3QCp&4Rmw-uz{#2WTfNCgmjuh8V>+F$T*27V)+*>pOkYne1eRp*CvWu5~PI+4|
zM_+ONpn)9Z@%%JmY^l@66#Jt@08)tH0OS<!_N8%fvO|m%<5?C_1hmfNbl7$w_~e#k
z+wva&GKv65Ly_wPX#{ydTPUIkAax+hVYP0~k9(Wa)*db4h$4X0f$FvM66v#aS>irb
z#L87hxFd>y-2-!Ko2v)(Sj-D8X&i{7f9nfnc|;Ka9a4v#hG>vJ7Ko#t^+Dg-M{4B}
zO#qZw3kZ4mUb3(r|1H3*51x!I3nu~AcvU+{S(3+%a}r>^#e!oyB%edkIDH(w>3vQD
zHq14eG=MZ$1MV)NSh<pu#BToPRyqk_60QQFcldFNq~_X(@z!#6Cjpp5#Dlle&1Yf%
zm0(9IV(&ZF-Qg_2PJ!1DQw6YP?Ycg_1-MRhQsZX=PRg@o?am@F(Nhr{|A`0;BRZ_|
zsZu2}cR<zhlSrGXDSC!|9iuQb&R<Ojy<|U0)G>Hvgw)|XG+YM;ok1_z{{;X5|Non)
jD9r!>00v1!K~w_(w%zM=;mAWt00000NkvXXu0mjfee`Tj

diff --git a/static/applocation/czqb.png b/static/applocation/czqb.png
deleted file mode 100644
index 8b34a1451928b5e345b7198840246bfb41a9cdcd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 943
zcmV;g15o^lP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000AINkl<ZcmeE~
zA#77Y7{~vu08`PRrT|e4s#TbgHDE?U!UQBFm^DEnCK1SqIS`YC&XAC>1eTC6Luf(`
znAL!xVqlm7DyA@x`*FGSwQJXR@7-&7ux9_h@9w^L_y6B__uX}6nNPDFonLB4Z<n4#
zKMkV49_{D_oDFrAF``I&iqw=;RS`asR^SYGBJj{~E(UQ!H1=1Gq;}aTS&3B^%ZyYf
z0>vUd%C=f`0Xh*d8qxWe{@)1PzbqYx+L>WA7AnX4-n%sP^|ew*V7VqOo|WngIs)2&
zBeU9&C{OaGkDC{rr~fmx0EXKBDBXU36ukpO_<{s6$U~C4Nxt+!Uuls^z_dX(-bshQ
zB$mc%UF!dksGH`Wr9Kw{2Zy6kS$i!}mxbuGcXJWI2Ckg4q#=&Y`kzK3OMP$wkbQi^
z?19>l7904{HHmCAtPNx3A^>U#;R)h4<&a1$VEwAi<$27a6T~tjQbf?z&3Yylz`ABB
zJiBFu%<9;;9pV5HJ`qbS07AWQ((Y&dIg}_bn_Q2mG*N*h=fvVUdXku+tv#vx#g>zP
zdkG+;Y;<jk+<b3`;5tE62s?S7LyMNmX}f6=hfN)A_~85Mjy)%6hd77aR?nUv_$Gyi
zfMJ&i+5TjOkmET`Ik=cn2;zy2Fn~=RZA1)TNb~OXr&1c?^aoN2;6(?n2%8@y$TZv1
z-5qOl^2YJtjTH=Gd?C%duAj8e%mT&-=Gp+U-M-l`F?7G$gKgYDYdN?8HYe+PoY=Jb
zaX;U3Z~>%35Ep^X#%06%5}f59Tmb8y*>)lzk4>G+T(d~|v<DYJh9cEM7~%jC2&2u1
zToT{l0wBD8MM40?0Ytcp(1sln!3D5Pm~Fs}la;UmZ6V3iS8xIG6p8>2EtgVhW6+QY
zE`V&)X-R;K8Ndd#g(Od3!3A(da3BJ}mAP^-Xh;MXz=_K>0YDyL1C~-q^7Iv40G&E;
zHST|RrF@>b3gE`dMK2%fw%1$**dg-$_7cFaC+_!of-!s~Cl<g@Nj50CJWnu&Pqs=d
zfGomkIuEdSl13r1fTSJH+wVlc#2KGs<v$UD!5k+n_)uk)Wd5C`LVilpPT72!%dd(U
zg@Kv;wQ{Fb+Ao#VFnFnAd<KSV$Dq+^mG*xF00960iO*b000006Nkl<Z0|2$`_jE9$
RK3xC+002ovPDHLkV1hkNuLb}B

diff --git a/static/applocation/dczntj.png b/static/applocation/dczntj.png
deleted file mode 100644
index 5b9c4818a4cb3c284be30ce3576a7988c19532ca..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 895
zcmV-_1AzRAP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0009tNkl<ZcmeE~
zEo>A)9L3+QKvi78R1w5sz}y)ykT$^-MMX)Fy#!fNi9jOiKvWX0k^~Z{qK0q@XTY=y
z!-;}A16)ECW|?0n8}^#(-R$fP*KKaow>vvGJNw@MYo?pX9Lt^b%2Fr&u=FDRWsshE
zbka9)Hq@2SNK@@A)v~0zs&J%Qg)`joz*EDy8pI9J++RJFI*C!Tn(M4qGgT80REzW|
z+j`XnXf9yXqyPVI?t!v4UtEwjZc2}COO1=gXPc=9ApHEEw02EeX-Kr!Tg61oOaSDc
z-IW$DNJoF9gMlT!-qdlQy_<fXiGV!${!i(_D{1rHKN0*sow^<2Eda|AyI64&u&8~N
zJwuN1JP&z@;{krnu7e})+~6gE#3NpbUD}fX(TvI@^2GkF%hJxi6kR|@eEXAiKOt}$
zwm)0?)5zl~$nPB3@vdht4>T^>>0f`b*J)=L@_S#6^$U{cy<P%%&=oG^d*7t3p6iUG
z<Dv?fM4kdb*pSG+<dG6hK%P9+C0}h=b;%==HQx`RqKGEo$sM~OL6S<ecHL5gJgYAK
zWyv#R0RaqmLvvB0v=SZ<cO|M7;X>)nlSc$IB5LCXt>TC#04iG_?KXjGg&4vL(pa7=
zV*rA)%Eo;WL=k}XA+d7RdIAeWo?LkRzSu&=Jd+SbK<~SKC5ig-zK(aA^k8{BK|2(p
z2_WvVI7GP;PNB&&cN76kOx%;eSe<RgUZ39Z2qu71Niyb<<pS|Pu0MpFU;;=~w#hE=
zEt%s42NOWd6Xz}{y5k&2JnIW4fVxhcyC7sT2NOV?v&y<4%Z<#6Wv;;l@E;X<-~#qZ
zWk~0r4JLpbpk%rtPohlQO8^Vg$(ND?d>V1VxaUvK=X&oYp#Q^8PuSR&|CwzzIWhR{
zH;0!1R#`007P;G&%78V2xqM5jmjFV5Sf}Q@gv@DU*!1xwf-MIke0<;~fEV#XYCb}I
z!PXkfV-V)_fwuskm&JHyE+B?gi_96v14S5=9D6PV3`-herjIA8$>Wo%&csoZb`x_l
zYpJT}g`qM2X3}lf4r?{F4Bo05$Ix)?8nn9Y+TmXS00960u+R4k00006Nkl<Z0{}@k
V4}*epL74ym002ovPDHLkV1jezpVR;V

diff --git a/static/applocation/dejbjq.png b/static/applocation/dejbjq.png
deleted file mode 100644
index ff9396642a2c9569fc409ea013c170d00dd4bc91..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 947
zcmV;k15EshP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000AMNkl<ZcmeE~
zF>ez=5QX1e0gaI?D$@W(XrQqxnxI6Y2^A@VghUfdloToX0Tgslq(nF+5|JPh66vr+
z8ffAM8d3xrT!9NW&@B6LTKQ~Q-aYHi&Ly@o*}a+BnfGSax0}SWpVgMRy3#TqR$iLl
zR?LZ)mU#na3tcf2V{|B^RY_Hq;bXK8X0X$NXBKlgfLoxcpQ@2sv1PKJQkH9KRHp;w
z0zHhjT6O|j5E$<0?4K4Ln0?KMGoGCe)N9g{+tRCh#mI}hN&KaY!xi>D1$AJvAw9n%
zEnk*u6%`@?Cq6_ruKQpQ>|O!@-mDK6%wqQFrc^l>mdQ(is)U8g*K2JlES{G@XeGkZ
zg?okO^%4kAIUmmjf%(*ZkoD|#;NXX}e>9LzcTkmXU)ud5?Ho$Xo#p9AY3sez|7+KM
zv-Xa&Oh0-%;6Qf!!%4P3NdR&JSUe8COAq&??av9o`>!QO4l<nR`xZR9apwzqmy>ut
z@e&{@AOYe)5|k=(V!Erv<6CGG;JgBzo;mBWZrqS6=cS`xk|ToN3GwL={^WJ~Nu!rQ
zdhw2JxeE*dszoxk3w}IfhZrX~!hwVi&>V{WKNkEYyM^rb!yi3s@gY9*ERu-;fl0(j
z1sRduugP{|j!<<*ggXu+gjtI~3LSIjiyd87$wYvPIzU|RxOg!Fh-x}8uBw1R&xj3i
zTa9%HF|jjZXP!lZ2oRWxbDd^R<=Cr$W6lTw$T9LIM2GOULdQDxI9rYvfD@ka!%jiS
z!#tFPmjKm$_aM1W1CYRgMj*kLoB7%`EXkc70N4<;RJ!w1TE3$HS8@E&<Ch*GiZA*2
zzF_l-mjFRWgHR<B(Gj);m2<B|NTzMPjfeq3fY&Zayp8x9144|f8O<?HH|oQ)mjF)V
z1W;6o4vi*D+gz22fiFS<(6bI-Y}3lr1g1@x_qqjvyepbD-s$fE@93;m$-_T=7*2}k
z?EnOL{Y?szw~c%pfFW_c1PH=`L{R2M3za8dXr3Sffak;|Fh_q;LVW&~AYZNoTrjp1
z_ne}H_%2uI7}SB#VDs=>5ST~R(>aUjKsrOg^HV{fS8$OE4Ie9#{a=Gh`H7^x*#2r-
z^kwWq&lZ0xZa1UjC{n}9TT7%2KRt`JZKcs}M#ujE00960a>D)700006Nkl<Z0|1Fx
V=X3)JSMC4+002ovPDHLkV1m~ptpfl6

diff --git a/static/applocation/dxts.png b/static/applocation/dxts.png
deleted file mode 100644
index fcdb6eea503dc7b4463796f4b96d804c84c70128..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 945
zcmV;i15W&jP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000AKNkl<ZcmeE~
zEo>A)7>3_nfvRXwRe-2M-5D??ZGr(s1tiE`f~=@SAQ3naNWxW;&;+WeAzVTgrZr%w
zD5z6#300V7p4$xUZTDwpcUjoxF8AKf&d>L~-_LwAZ7B0u8%CE_hta#$=h1hA=)cD>
zdIe`gT_KGq(t#qaNm^7FK9Sbp40j^%*l_L!aYHomU5un*Xe?Pzbaty5sYe95MS7O)
zV%H7O+<@7Lw*NMdK>I$Q)i{s9(t`Bxy7b~sv$%gvLiVh`PrucUz>}L&Z|St)x;;0R
zC1jV$sb#>*1x>wlZ&$kevRUkWjAfTOr<MWB=cVyUj51I8j_)1CE6@?QvVUtCu>V!U
zQ`w^H^`88U*DsulpLxGt1|aPAWoe_QDM%su?0eN`S(@aLr{Bu}Hr3`;L%!cEkc(p=
z<O^p5s0!rc_JOqZrdc3!!#IU#{xt(uE=uI(_Mvn*ZWhRdxJ%t<UJ}j`z&jX_T-;<E
z+34_<>1==$*Jale(v=7sxQ<LO10aP$t_^jRS~+Z9Ks6%*^!vig01hoSFq_UA!aaz#
zt77It8rY)1Dc*_!ki-Z!9ZDa)mmmQd06FGlfidO)HY-j*2C}M>M~_zoSdawAJtQy$
zQji0Xweu*y&u;y>m_2wK-<j$XxAJQlV1;BE!af1)6+BGp0j?i*T@z1d1I9n%bD&76
zH3Xuh8s`OVK)Yyddd#(?78-yMQUE|;@3TZ3P&v{{?K^WJO={7${XS3j7W0q3@tcoA
z1Gt}%0v6nZY@6!Cc)sXrBRFk(DKu9LqF9!4g$9rkcrg!*SEHG~3eR&dVg^y<S%g9Z
z@Bk#!Agqj`jEa*4)u>2e*%&FuUw8l=W%COS$XX0pTNWvqX>4A}TIJV=gQ#3CtGo?B
zIEPR!%x%?0ae5B9pYC&ccQ%0304PeQ6o(Sn`4pF0=J|k}M=s8BA)TD#WB_Typ_B((
zQc116IYs?c9U|(QHr@u{85HD!afI%F(eM9KumN2$m0L0OoFaf{NRd216a$`qi0?Vv
zk9>e!)>na(0aXOIwPtQWTb|C-Gmk)~XIkt$6A_rS=&;6Bg$h*h2+=?P1k!G3eg=j~
z7o#vS&ff}0gWxy_)Hir-4C%smVz`bB`lCT`{0jg8|NklYdeHy?00v1!K~w_(miteG
Tl!(Z800000NkvXXu0mjfTcfV7

diff --git a/static/applocation/fx.png b/static/applocation/fx.png
deleted file mode 100644
index d17e46ee0227188a478ecbc47b15caa8816ffd14..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1359
zcmV-V1+e;wP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000F9Nkl<ZcmeF$
zKWrRT5C-tME2vUfRG|Ti&_H81&;-R2O^}dC5hNs<SfWgkl7f;V9TX`MPJ@I*B#4AW
z8iXa>Kod96;3ClA2CzhEXqNr?W#skxcJ~gSeO#22XW##M-#0UF_MLAW^=Eyvdj8U8
z_3foksy}O~{`az3eF1X~J;o|k75Afx^@v!BW%yKa1!mZJ;KLg8asaP^HvU$sh|O`$
z<VvG+xvEvH^1yO|K8ki_*$KoG0!KYMdu#Q4#7D13eDzMm)<(p~Z$`ZLYQ*_-)9G5M
z2d=FZ@JO6{ssO(5bj0NgrC+`Dc0U(J0LW{r1=#KT5pR4NvA!Ac_U94zevShVeDGRC
z5-T&0KNm)T^})IIeZ=jZh=>1ZMeIF{xVas%{c9m{^~KWP^;`%6p&`bBz4Oy#Xm@@r
z{g+=TW!G~d1TriT=mNI0S4MJfX&rx_hydj*$)f7V)lcrpaOqn^uho4djn7PgV)6Ug
zTP5`=r9Np;eJBN5fBh9(M<6Z(mDbUxJ@oAU?%6Ff5ug-E*#nTaT79z1!JIlpw#To&
zRPuZiG{P63J)Fra2-2h10atd(R0JsXvH_eTAt3d=d-pK?so(srWD#@B<r!-cv;O+a
zB`pez8(&8_sK%sAq|H%g=4tAqbCOI&fR)l}HkGScX7`W7^rwDrx8!lD(Plyf3DR7T
ztV4S1hdO0GB8`YS2pdC?K6?6OkN~%*i&@>KJkY09Y6QR>z<^4tx7P#7AOtZlG;5Kt
zen@%=*f`zk?a1n>P@Fmw*+x<bSfdYs^n~^hC<J+N$T)O0rI!FuENDR!yteQV=iIK1
zP|npRJduFt(l>AEC-7X^Zu=L9v()qHfC0w~G6wKMOkd7XIy1_Pk94WeQ+f#iWi#QR
zYzmi)UmjrnY&Ykq3kxNWDd#P{1ai~1Re@-xJ8_S!K6T?MNub@I<0mb939xF{1`en&
z$~nSExU|V4)}><}{k;SdOnRcZp|J6ONPupQq;2UOPfs*;%%k2*VCT28#iRqs;v_xb
zoH*=Bx~z;?eWuig?lfiA?9W~TzEn`jiVmxKiUTaQvMdt9Njt}t*2z%n<}2qdy#!d5
z*t8ig+9`P!vfV7*akLRkJ=*h>UII2^Sz*DN-n2^nDU-lC2M9OMPJ3OhKWRBg06<o@
z5fDgZSm<kuP;+@}&aqC4_0nt4KWTfAfDOd&``?teF)*wPkPva5Ao_f%LC_pt<2{!&
zMxe($>x^p?-r}idpZ;lODgu-_&@N;yb=o#`zhPCv;=mXa?{1ce1CNA^Wz0GxToR>X
zbskd^dd!<vrY1lkF#hEM5bJtz0gD{4LM^Yu=30{?Ls^&oz$1~Q%|nhSXCW~Y0h<sY
z4gl9*NO(nf9T2MjMIv;}nIzWn48l3i2#D#IlJz6kB&M%R{u6;NWz+N{nBat?FF1$+
z&lq$VmkiX0<je^)0Ri4@BbR+hG{?H?3n8%gSAmn)jM9pO|A#sU+DSycPtKeG%kKSM
zAPEzPR_WkM!A5|W9Mp&8%n3-D-UkURfg{5D!bnoc@uBj}39#-YP=K>~GaF5s*X}!W
z0y2%?0ou~_{%8Ykw@-&adzVveKNbY`Ptic9u6i7!sDI#zrTmN{?vCq6{o`gVqZjsT
z<KGx>ZHyj_MzL1Qm$4k5{Tl05Eo)mFqX+*200960%Cxw#00006Nkl<Z0{|1@J%d8G
Rv#bCB002ovPDHLkV1g!bhqnL#

diff --git a/static/applocation/gdjkq.png b/static/applocation/gdjkq.png
deleted file mode 100644
index 43124cdb6766bd8dc2a3de14797374697d3012f1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 813
zcmV+|1JeA7P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0008wNkl<ZcmeF0
zFKiS+6vn?@fvUKmssK?8m^+0j=_MFQ5ET{3UV=naB9I6i2sBrNq6t({L%4(*RBOOc
zQBYNIq6#z2FPF*AZF|Yg-t3iacGGWn{=A*}zBg}X-=(?i)gPK0YeVyS?Tz_kVg7pz
z&3iao>dGk?qXQZBC3Vz<%V-_WaAyTxTF%WNZi#w-9U~2Mt7P44Y*x{z%L+7$^fcQ}
z(*>v%FukISueB?%c%M(t7`+0UJ!v$k2OGDh$%WLS1*~2R8Md0u#_jm`q6M7(jh`g+
zjg!+*%fc>Nz>6=^vriJw)L`6#T39Js0AAYvCG8!hN0rqL7O-?hy1$~@5xd8N1w6eg
zEdtN)Nv|G+g%4K20%ASG;8oFG4u3OPK=_c0wQL38@52+RKP+(co7S`71bg^)V)y8s
zME$H)Tua0X%pRDS_0xdYU(dJQK9Jl|$yaxI>3qAG)+7R$kQ|AlmNF{>C_CV7z8%yd
z?hB@^Dv}9+JR%$szS6GDbL%7b2{<YzrTOp41mIzg+LfylQq&0<YI{G5c*h2@E|ln>
z2gwBBaW<yEfp@-3)VB`{iliaf&Dtl0WmqYh0Md-jt_1Kh)8l0lG**N9l+ATo=0`dK
zH!XSlV~2e}%0ZYw&yi>2(oR2cBC(kV$pjGR#5~yfCPCOI#@?XMfl%`MtCrIVu<13i
z?m+DOq#*42c<%r7d#jg|33zg6l0}k9f^vv(?$ho-7*(fTyqQb@A;K5g!R-MzRk^<$
zV$Lr1nM^?J#Hs9C0kb?wvgYEQ=W3#JzdT=UD^QO4@}4LYsag*fz*n{EB(d+gk6*}p
z!2-x8Iolb$PLPI^euR+6CRhOEAMZ*eVs*kf3UVO`77#MnMcA|gF2d{nob{}LKSRys
zOCexfvy*BaK36917pod|WzueLZ}vZ4YT_!4t@F3?(I7j{GW9Gzs2SJTavfRpMuY75
r9{>OV|NoS46E^?=00v1!K~w_(Sf}T7BD>ef00000NkvXXu0mjf)J1-m

diff --git a/static/applocation/jfsk.png b/static/applocation/jfsk.png
deleted file mode 100644
index 907a76c7a0db4c9f8cccacc9b464be77a6556576..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1018
zcmV<W0|oqvP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000B8Nkl<ZcmeE~
zFHjXx6vn^zg2}*W!J-B%S{_9U4$N3ENx&H+%oqto1JPj9Ky-XWXJkf6QdDN7NP(h7
z0$L;~fn-_l&&!$Jx3bIb-d%K^$8h$Z`{$hdednJ02fA`UQ~l`jWIuX0`7HY3B>Ly2
zAH4*#gRU-06lq(LrX-E14L^})zzlX);IYHp4&V-G;&&vH`d!ClCehd~HByfiXcy=~
zv?FaNpdo?56+Qjha0T*WK6_1CxREy^ysxnp7(MI2UzcXDO6cKGkN40Rfr*RpgwtcO
zUbog9flD#e-i27NTWf>>DbpL34u5(<KYONb=-yu=1OSZtoo~|S7c{A<G-`yv^c4?!
z^Q*M8@AZj9O8J(0zO@su^Z_0O5K@U%X(EkkCjijj;9cqf9NGO&OEYOyn1DqVfLX%P
zIXCXX5_zvl>z}>G#g=88Y-cWSaq_ni0ha#xUFpf~e0g}wUt0Tz4)kt3Ib>)9*hxO<
ze|kq^&e%h?R)_#;u=;V(32DIwP0Px*bboDdEcT19C48jEQ^!}*g3}9|WLuVAhycdR
zThj6eG%rNx(R&GCNm<$PXTKj6e_4U$tv|=(6JLx3H1(yo)QU-A0=QfKB;9)<0fuxS
ztt{v1FDvW`QU+i6WaXHnjGs~jaLh!IARVaB^`r+keeP2)B19bE3+}OpjxWIDyNG>q
zOlbmUOgfN4Ov)__Ai!9ER!Owkq?|gW%+ec|nl81_vuyI(D-*!!x;tsee>Ne&cskRb
zCyZe%Hbk8hDsTKreL)0p&I;H$4=~#D#8!#4!8UJfk-lI8Ofq(!Z~X4@wd21;o*q(&
zGE{0Izzqx#&U8wXv2#)yC}~GOk2_lp>QyC}0N?>aWGy8C&JoLIWpkrjda+p{iVfqc
z0yn#G0!Pne+Xu<B9k7rBJS6PS;HCutrx#_2gcCUW+n1;k?c~|ceSxrH0cm#zW2uuy
zlpzvCfcz#Eh%^s5>gegSJ$+|z@i7itZ2lSn`^yU;qzRGDI@{U2+!>5vEH(gV4^dW?
z;1#fmd4vIwoVT`gNgrc)v09%6!Rlqp$^<Ne2CB>>j29~_g{`GhS>QIlG65zA1VUPv
z!=fd}E*l(sd=<4zkE=`oM@)>MSCvrvAOclE*J(E-P-ir&_!_Rju~9q4#{Xgk4o)#(
zwNKSmNA5p4YUNKyTI;&cyhGo{RXA|LU+iwoclJ6RjXQbeh_vDNz+v5RGQKh2+4}_m
o0RR7*R{?|o000I_L_t&o0Ew5ubX(?cfB*mh07*qoM6N<$g3xx*vj6}9

diff --git a/static/applocation/kctg.png b/static/applocation/kctg.png
deleted file mode 100644
index 37dd2fc69f3442813c523461e6ae7deb92cfa27a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 857
zcmV-f1E&0mP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0009HNkl<ZcmeE}
zFKiS+7{%YNKvi5&RRmFoxierOZGwS>gbGNIy#!fNi9jN7ASwx0Lqb9msG^2&2{mAP
z1`HJi!znmX3}%=glL>bh=*{fSZoBPW?(OXE%+B}T_h)A|m;Ehu%=yKRdAs=3{ID>`
z9v$-%&X&4zPK?p6jFu!dREM9@GMwQ~1Rhz=^&oDE4*eTO>f~0*^3ctCof<WXK)pzh
zvTf8|fMx<lBU=5{ECSX0eAHr81e){GwFQ-mg|njsCtU>#SZPU*uS@r?l#3@fC2UP1
z?)!rT;Q5uNwE0oG^P*gA>`K_erYCt=8!UiH);~!7gK!Wr5cACDCoD<xbFQ6q3=-fc
znLFdp!rI<9CpK)f8x?CKN&xvEQ^dW#wEbC8MUM?9CF~d_fHwpN$^<sTsJl^70?IC6
z=D+dG5eq#=31HHgf-Eu?8!?C$5HoodV^5QSIDfJbJ-;o1*uspllsp0~Ko73EZO6ec
zM}_SHZ!Y@Wopi^f0&ZQ9AdC0c-%EG5+_r=50qX~=GHp8gO7lgAXCc0NQDXIlxZe^$
zcBAKn&_^UlE1scmS|o`89w*O9nVqly-agRR|LN$mT{u<(w)dQecfPo-HXa^MmCNT`
zYO%{?3=v|R;p9wrOcDVouxKF!Pvc!ug`5WzHTUTIUxb*W2$BdOB|Kq-ti6^VzSEyA
zF~sk`aS=iQ;{f-I5FURfi2!QArwkuGqzBPpZv(v75rqiG^2|7yBG*X-K#;t~`*@cc
z81^vdq!K^?5kg=Q!sE{*5x}H--(8yEWv&r{nAJ;vS7X)&B0_{1lLE;Ecrthvl8_}$
zNEa3|?hUUEe*Cm;asi$YWJwi>vyhQGzAt54ngB>r6J-%+eh?*qVyprX3q_Ow3bP7?
zl4o3y01A`0OO@c&48chV5<o5^qDq9;PLO~}UO3ABnSi78KDNt=05eyF6Cq$wk+VuM
zlPi<`<W?<znY5MLL))^iV-yC~`D=N%o$Y6tS{ARYkUIPamTT9d)oo|{zX1RM|Nj8N
j(NX{a00v1!K~w_(qls^Wk&IY)00000NkvXXu0mjfX#;l|

diff --git a/static/applocation/mfpsq.png b/static/applocation/mfpsq.png
deleted file mode 100644
index 41b66da8839d9dc625e1c7a29cde1be6dfb8517f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1046
zcmV+x1nK*UP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000BaNkl<ZcmeE~
zKWG#|6vn^1!ZZ<r)!C>;Y_z#F+C&nti6EFFf?$(?Wr~y*mKN!>NGV<#K`@{J!8GE5
zX|zciZA=kuOrr)&WwXxD@v(E4*}DlLm)meh-p>0oZ|?ivo0(fumHSLKvI`T9?A^rE
z?3a_Q@1>Ew1ha##DoU1VLzyNeji?NtOw(WnI~{oBFqZ?k0~-8|WKyH*m`n%Ga;cf>
zbf8?IThWe`oqz@eT07c%YtVt-*Sz%`2OVgwNAImc2YO%g)^9wS9ca!;{UWXP-fx}E
z4(#VCt$&Moo&T$}_&y$sd3W|Cq&>E|6Zf~zYqyg+u=ht=`_i83ZDJvyr4ODEq>zO-
z(!Evb&I@U>;Ya*FJAZEdJVFA)r=*A1^Dpb9(W&7fsebmq)coxG*QDpSrPp_*$2Yt$
ze9l~w>b205rYCn`d82hfT24h5*Co?!&iFZLYE=IOA`}2{wP6XpbtP}De3Iybx6+?U
z1Xyl(h-WSUqN4LxB-3Xu=W){jZF;A%cDk5cr@SZu_N-NtWU5As(L(_oF?^wp9ZGmc
zLVu{!HP$d69pT)VT{K1s(8}da$w+WeAG|GE!uy#+9@e_Mnbx-4!FR%$AjZKB1s`)w
z_%600HW$XyM@4Td;-N$d*aSeJQ{~w9Acg>(Y8e13zVq7waI*D70xZ=Hg}hM4&r73c
zyodF?*8SO$K$y-x4{bnlMRJHC$Sq~tjO{QxCYg{&0nBD32fqp6%?DxgcN;qrpeiiD
zf;XR`<w9k#08M4v2@*qyF+!NJNZ6v*!KsTyv-bO=1gHj8;)WrG$~?J+mJ8&#&zYNh
z;~H~}aD0Zu?}QbBF|><v@J9)-9cJr<bAd!|rD;^1{R|+hE}5JyV(3M}?+7G{;^vPM
zu%L}>A+A=lyN%4}Rv`!Abjxlda=9WQhHk<Q#T>I!$0Pz&pC7H1MFGzh2ynI`XMhf{
zjd)LD4XV$Y=q7ZX!*6!#m_&fZ+N%Qy0Ihr`>ILuso4@MccK~gNlkEU0E(7L3%4hi}
zG1l}}`ZI|D!1!?qmjwiVKmwQ;J`OuK6E+};v0dl{hn^T@h=;QI-TiL3SMAW3q9+jm
z7%dJL#0L-r5*EX6IwOD)bV#tRAch@Ekw2Uh(~}6q68ps$CBSO|ugb?Q;OJJUD1mNC
z{S+S%IPPu?Ixy(KAuDh+Tj-FW4w8N%2<#q&alg&2sv`IQ2bJ<ukyfkj;r^MfGIn9t
z6@Q`HoU3eCDjIY0O6B<MI;>46W6inB_Fn)10RR6c{6-@H000I_L_t&o0F9v6bm=(0
Q6#xJL07*qoM6N<$g49~-?f?J)

diff --git a/static/applocation/mjhd.png b/static/applocation/mjhd.png
deleted file mode 100644
index 863420b3e9c96b566088fd459756e2ea72b71a93..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1482
zcmV;*1vUDKP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000GlNkl<ZcmeF$
zJ&0UY6bJA#Q&_FAXtOqIu{PT5HrlLY!6t%WiU@*D7A#Yww6L^Dr$tI}(g=b94G5+Y
z7u-ghY@>}^L>sqJ7ffaIyuW>1a_8~BW@ZVFIONQ|@1D>9Ip^MYCp(Sw*`HO<Uz%0l
zUizf^Gg0-gr&;xdm{aI6HL0q&A64u}#Ad9+r;00L7P|_3m||X!z*C^bzs)LQHcd#b
z6pQOMtzt(7)+^}wXgAj#K>QCNS9Ifvh|Aj%@4XuF@tYA}y%TYGP?NbeJThAwS!?xi
z<qGU<MSS#n9q{#6A_RB*Tg0vJBW`|I)9w2a*6@J%?5&6oUW=f+Duks02u9#Y5I4S#
zc>D7R<E<Ye?wvfMJ3l2rX$^0GR)bP8x&X1o#xk@NfXgq`Z6XLkq2tqthkuU?0XRBH
z6|~pY7su%~r4|NoZ8!D#Udryz5%1njt&sw68Xfx#w5r|tF+%&XJyti%Ed+prYdfhO
zQh#fcY-H8(_Hk{KZ9W#UHyXgzmm)Z@Ira1+PR7Wx$u=KOsxdlbMgg$N7<QU)L~$9?
z@AgfXF59`C`0SD^*GB<RRvT2QOXWr9PMz(i>Pk9F+k(`Zrw`-&eKN-WAOKlYQfGQ;
zP$r$_Z9$ZBZF8rPb%5A0FG(x$i^}!3`5*wj@3cTo1G4G#Xs)+Cmq2CM5vpBOwkgjS
zQu!vY`P>VD)4gZwBeSW<v8v$bOsQ19J~T%y!-lNmc?RCR?HyphvD;Q5b~5z>V1QsQ
zxp_&lgmR_;&cJ|c5?z5c*N=Y1nWvLK>KCH~&2#3T`T;yM{Gt*JponPzfYK%<S;IF<
z2oj`ca(E@NgP-k|ymH<PK#!mNp2gco&YN#!t)W#)(q1g6k`Xxs`ZCP-_R}Q0sTTle
z0_;|=IWkqx>hJfziEwEv$q_88wM3lXTG?;vX1)=RjCmLJ0<eKfr)@?!$k{FVN?#Hl
zTjb4UUUIaM=PnXM7teYx00Kkg1j(B?%L=Y+A9H~V*hudDcuv0?%vYga05UdYeDAr4
zqhB6L(aBkJ)3nJm_w=s_JQV{(TV-C`NS3`eUS8`3AY(Ri7H*Ds0&$|?nU@afBRr(1
zZAulpm#*U_55Gz54axKZ7&--Hk^_NpzV&1T9rHFKCnz+Oefq%m*(1{nzy_0Lr6k-W
z?c=wubuu=sAUz{DSij!PQLawTJ{@mjKJc5wo*0_z<#R6pZ%9ts99Wad+&(rg!yE!(
z+(|D&GVBQ6?_V-1bv|zRZYR~nVaM1-y#P36K+iS}aG-tg@yO)N0^qWi$$P=e4H%nR
zW|8F3Wye^O$~hd`c%@t~0D|r=oFUJdWZt#cv)~2S)z>nwLIBYN+8RAzC5oL)d?7z@
z@><t82!JyrgQXFUwT3m-0JJSz*I$mv!P6nHBKD3pq-U)p;8c^}a=mRn2!N8Z%Wx9}
z9&+AyWnUKEm2&XpW&Gw*#2cTccSz$Vsw!Hm%O3rbMgfpn?c%MAN&`c4x@bra-`m;A
zr7B}}Mgd@4?=q|ki-Mp(M1t3De5l%xeCCe^KtWkK079v)T?Db0gXd!rn+pM8n1kF-
zeik|{tS>`!{kNh+z&>MpQ9BC*;6RCOOecw(CK3eR5ZRytr-N*0wzTMwZX16o01Vk=
zP7-IkARK+J1%lEN_6bm#tl_Dekqx?tEzir)(g3nEXSH+PQK}7GnPu1>0SXD;nn1Om
z<5S>tvz=wfl>ubOg3|`7q9p{Ge^Q!T1CWf0WxZ9$3j;70$YXr?PXIW3j0wANSJRk8
z`tw4p<!2IccbdM^A46jut8kW*e`9)hFnKVU#BQQ5V?91+Db~Y8yN3sp2mb&70RR8>
knF-7Q000I_L_t&o04s2(g8*04wEzGB07*qoM6N<$f}eM`0{{R3

diff --git a/static/applocation/mjq.png b/static/applocation/mjq.png
deleted file mode 100644
index ad38ce5061ccf735389b4f5f6426b24bc9279801..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 962
zcmV;z13mnSP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000AbNkl<ZcmeE~
zEo>A)6vyAKK$WCH9R?6pVD1c<BW=KdqM{@um|lXcsH{L%)PblZTqOxjpa}^zgiAOB
zrZr%wD5z6#q8Q9FzfJ~bw|n<?u6M^R?4@sK=Djy>-v52fUM~{!S!l(V=3DXG`KR%B
zL-Ev8D}I5`#&wC9#Ifv2EDItsD@FLkvWU<4P6i$spNrwRan$>pjYV3KL9*yEi#3g<
zMh1%Ibkf_|q63f;Kr*9~UzHh{e9V(4mKjLKWAdy2F9S1YM5;5AAb7-{F)bT*jlDb+
zl!3W(BG2xgq@~ODD8?-LFue5})~5Ch0<c^cA<CN3QOLLU^H~W3(D@>=wRe*CyY?`~
zEO`j;=%+~cNaWy~wW&RW0PG$Z=S^gYj!!twL5x0snECcc+h1fGn;NMAXu?<bMcU0I
z-I}we*BVKFS}*UqalzV?iXE40cGR9KfLe9@bx*lK1jRYN`CfC~%2fbXZM@Hoced`i
z<v596+y2B%rvL!DF*Inx-OtRDL?a_ha_wsUrmcH=hD_AX+qIPrevTXf&Tn)?XhwH5
z&f{F?tK%d``i$}cAON_kSFR>?`mIy|7=`*7Nb{Gjh)@cfA4Is7xDs(59!{q9Sp$}m
zq2HVidy#3R0w8Mlp69=pIgpYdiVxq2tiHD801sIfaXk|xKqAL^05R7{1%LsJ(^$+k
zLXVQc8TOF@z`(<?to?vPAE(hF6MQYn(oOSn0bo=0EKi-fKmL@C(*_8RQQwZ|kMsZl
z-~pJiagnD^DgcZ>zAfTvQ!|O)+I10#$g`h0^!sI%GD3DJBlbdw;W28Y0wA4`X2{8D
zNa`LU@<fz5#0};2{E_VVYciGQ`Eq}*0`Qgd%(;c!*Jq+n7Tg+HmJKpYkjMg&r<_LK
z16c=W@o*T&A%E`HS$oKo&nIi>`@DYhk!Qd^=*b-s$meCvAMDu1N5(sYYn%57YmLSV
zKs(&Y`!%<d4;rTez{)lI_8#PDKbZ=EH!<H9X)d3*DKLuM=MOt~_OKa3DgYYn_;yJB
zC*}@329T0b$DtJBw6CiI@Rg@=UIO^rSt&D6X5f?&7*7eE(y5T`{{(<u2;ynejm%GZ
z<~=%XZsqgG{0g}fnTPq+Q;L{{o(cYH)NWP|D;235dMU;D^o*}<L-lsEa`+1X0RR8(
k@9bm%000I_L_t&o0KQ2LgY}z8UjP6A07*qoM6N<$f|1S5f&c&j

diff --git a/static/applocation/mysyq.png b/static/applocation/mysyq.png
deleted file mode 100644
index d649fa82dc1fa1ef78649299c5c5b735c8673454..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 930
zcmV;T16}-yP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000A5Nkl<ZcmeE~
zF-#Oe6o&u1!U_|D4V7A8qYX6LU?8!<N(xL&Y#_0uptP{Gu+zfQc$6lRD2a(Q#!IBJ
zf<_xD(27b)q_SD(WAeh@-0a=#!NING#eZkso7uPj|K7~(N?q<Z+sH1@G_sE~FSB0`
z*}$Wby@9i%t~#A8)0Q&LN*YxaewpUs40kH<)N!r`aYr=wZ#0t{b*E%L=d4yY(<BwB
z7U@>Dqg5B6p@7zkp1w7#!0G3_^@+m@wC3aVt^c<I<0DcC%YW$a)gC!#5sTZND)8{8
z^y+Rq>@l&iUVQKFOA})jHQtsMK)|_)c(9Z9Zhn_`es+#pTEM{{X>}_OdsNYQs(<r`
zk7TX4;@8pw_6{8R?Ktcas|Dk!{wJR#616zx_nF0wwaEgOZ%EChR<N!K$|eoRda+;J
zA=(j$+ikff3z)um6u4i#jc-0OLO6j~{~J5rS9DDlP!!;#{A}2@uM)(`JaJh{ELr+R
zC?TLIMBKl<*M5TFE83XTmn7CaYail7ox8%dGx{dr(FX}Y2nu8pV$VNg#j!Z){RpME
za8)Pw9)JKrQ^CuQdl11r9HH182G}7OTY2xj+)Ix=U<tsEA-MtsCxfvdF&~?r43f<U
z>k^xhC4xUTAF|A4jF%-X)j}BkA|wkS03>KrfLOA}ri2{#?ERJ?MLz_>tU6XTD#88X
z+`L^%fSnHc07ZSW32Yo9*hQO|d5EC3tn)mp2L2e51uR^XIG<xdV!p?>Br<3(B9;?2
zh|PyI%apNax4B9P2HuKa(*?K_fh@+uw0l|i5aMiSl+OrkfE@w>An#xMlDFdhWC8Kp
zi@khifaU9c4o4(5@SfJ|<hW#+M?Cw7J<%;`eG|a?J;ZrWbmD^lFvI6P?N>;f*ZOBB
zz=*Ih`LLrkU##Uj$W9-~-+L{Aa9M@-_N@ZpgSy#Pp>FfS@xc)=CfR-oNp`Z61yEi-
z2lB8}f|BR`z4q<I>O?pkOBTS}l%p^Yd*GpfWBxCUxZTeDkUVy>045J2h62vID#Hp4
zD{#yV^k)ejlT?}8{|N#6WfTwE+`4LV?@(3pSCiK3?&AL9sVY`s-z9&g-dw8f)@qt^
zc&lps_8r%z!&Gyrw)+<V0RR68U%f8?000I_L_t&o0LwW2bjvK9lmGw#07*qoM6N<$
Ef?fK;t^fc4

diff --git a/static/applocation/myzy.png b/static/applocation/myzy.png
deleted file mode 100644
index d649fa82dc1fa1ef78649299c5c5b735c8673454..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 930
zcmV;T16}-yP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000A5Nkl<ZcmeE~
zF-#Oe6o&u1!U_|D4V7A8qYX6LU?8!<N(xL&Y#_0uptP{Gu+zfQc$6lRD2a(Q#!IBJ
zf<_xD(27b)q_SD(WAeh@-0a=#!NING#eZkso7uPj|K7~(N?q<Z+sH1@G_sE~FSB0`
z*}$Wby@9i%t~#A8)0Q&LN*YxaewpUs40kH<)N!r`aYr=wZ#0t{b*E%L=d4yY(<BwB
z7U@>Dqg5B6p@7zkp1w7#!0G3_^@+m@wC3aVt^c<I<0DcC%YW$a)gC!#5sTZND)8{8
z^y+Rq>@l&iUVQKFOA})jHQtsMK)|_)c(9Z9Zhn_`es+#pTEM{{X>}_OdsNYQs(<r`
zk7TX4;@8pw_6{8R?Ktcas|Dk!{wJR#616zx_nF0wwaEgOZ%EChR<N!K$|eoRda+;J
zA=(j$+ikff3z)um6u4i#jc-0OLO6j~{~J5rS9DDlP!!;#{A}2@uM)(`JaJh{ELr+R
zC?TLIMBKl<*M5TFE83XTmn7CaYail7ox8%dGx{dr(FX}Y2nu8pV$VNg#j!Z){RpME
za8)Pw9)JKrQ^CuQdl11r9HH182G}7OTY2xj+)Ix=U<tsEA-MtsCxfvdF&~?r43f<U
z>k^xhC4xUTAF|A4jF%-X)j}BkA|wkS03>KrfLOA}ri2{#?ERJ?MLz_>tU6XTD#88X
z+`L^%fSnHc07ZSW32Yo9*hQO|d5EC3tn)mp2L2e51uR^XIG<xdV!p?>Br<3(B9;?2
zh|PyI%apNax4B9P2HuKa(*?K_fh@+uw0l|i5aMiSl+OrkfE@w>An#xMlDFdhWC8Kp
zi@khifaU9c4o4(5@SfJ|<hW#+M?Cw7J<%;`eG|a?J;ZrWbmD^lFvI6P?N>;f*ZOBB
zz=*Ih`LLrkU##Uj$W9-~-+L{Aa9M@-_N@ZpgSy#Pp>FfS@xc)=CfR-oNp`Z61yEi-
z2lB8}f|BR`z4q<I>O?pkOBTS}l%p^Yd*GpfWBxCUxZTeDkUVy>045J2h62vID#Hp4
zD{#yV^k)ejlT?}8{|N#6WfTwE+`4LV?@(3pSCiK3?&AL9sVY`s-z9&g-dw8f)@qt^
zc&lps_8r%z!&Gyrw)+<V0RR68U%f8?000I_L_t&o0LwW2bjvK9lmGw#07*qoM6N<$
Ef?fK;t^fc4

diff --git a/static/applocation/new_user_discount.png b/static/applocation/new_user_discount.png
deleted file mode 100644
index 2f0fe738729416fb7b28154c4c04d93e76a239cc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1418
zcmV;51$Fv~P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000F)Nkl<ZcmeE~
ze`r-@7{@<5+jMI>Gs_=2(Nfb)!|2E6V9i0AM9xSg%p&WL{;2FHgk)3%!v2w<KO!h?
zL0K%anU*ev<pf=XWx1(gx|O<gYO^(+WO{qPJ3H)lx!b*G=je9T%YDu{_kExDd7kh4
zKEKX&uusvd$duw$k#$CGMv;C_r;Arcz9=b=++wEV$aq7s-G1C}lw;K2zuBbm!1?oR
z69~tNu-q)pHA=N_u7N0X49&f%W_gsoC64{bHcHiRjsT>p@f~(wo&d5k;OZ<wrR>a(
z4fTETeF8Jb!McZ`a$&f%ei4-1;M;zD1DG`)n*N5et>IErE6g5$5dfqc<d!qA@z-$a
zL_4IV;rnCe_+Hbm7F+?)*T->DPCzNLAP<IG&7W{hxR3(_$V`XH*Y<4G*ddm&X2GIc
z;r)5A__m(;{mcdi@JbQ9H3vox>R#>HbM9Q-QTVJL=1y`?!yOHF4Gf^d3{qu&t^jlz
z8y<m;kN%(Dnd=(4>~1KX3_}LO>iO<i(5n+vz@B4JwI61Tfx<B$f8Tio%75&liaJ+I
z?IHN!2XmtxHn-Cq3wjL<KnAQdqfT0JyQ;IFQ9YVI3OpK`B`&CIhEEMl`@c~0n>!Zt
z8VZ18r(i(^R5!#o=hRs^7l8rkFnTb&Faz$nF+Q)~Q6B)h7cHZnu*{+kRb1NX?FXT@
zljKru|3FSA%$ewd*<@}f-k=l;fSJ}sE}RCVY<FeQK-+2U^3!+0k^*>WDzsRybDjNV
zaNkYv{b4xLCeGj#4uElR{4_M4bPbY^>uJR{*xKpqa<gLN8)n7q^WB;ahXMnT`%D}L
zTN>%`Z<*C>F`;`j{r(qZII#CP$feR1>Cp_md^VB2T-muy?xRO#mD{h^6CC){z00kp
zk941NE%)o`qn}{jBv`!w26v8WytkAz02M0*X=cm{z2K;q-);3^_5|2(#y6RNe`_bw
zU@oQI9$~&OJ{dV}1msz3p@3FkYs@2^kaS3wH<sugV@`Z_6)EpE(%WTmO3}U(u*Q74
z)OJ<w^z}Yyx3u|2HHf~m;x&8_?6NjOZYI7vM?<~Ugove9$?@n8J3+mwN>_fKH`?<(
zDF70t-TBa}r(PvL+2sm7V+Cn>4Sf7F6pe+0=I3Aj;?C)+tn^I2`MsUa(oOJoEwoxX
z70}HG#L-2PA=%O)UD~v++3uf`0<d;3G+UOLKZTC;r(KN|xok7MX1ne+ZkqqY-kqOZ
z3om~IDrR!E$JW5(l@MD8ywoZk%4n5)Bq1>+1)!k?p8d+*;T6_-s+)`zEd#|DJAT+e
zXwDngsm0@yOvyfEFZWNGu11R=Z%t44qyR|3QA>?4RzXc8yi{lfDj&i~g_5zvWJ#uE
zKfeJ~Go&*aN*aKKDLCKUVx6RQnh)OWzN9FdXs$P;wPp6ABU$QRC0i%tN0u)D60FQo
zZow>NQ-{O5*6S-+HRp%4Mr)N;B}+0T+m8(K`UapyB6Xf}sR0@AUMYA5OLK`xyjr6)
zESHh2L~FX6?==7k)XPkw;1*vr#RjWdi|Bd3&w&6)S+c<$G+3o89t8#<p^1V!j9`_X
zcoYf%3043q5EYQo!5vnxN=G~j4S*+H0T~_KVFjxvKlUCv04eZ-dq)$9R9S-ttK`O`
z3j#oj6x^>{ZzS?lS+&*=T^Im<EC|SZNdT}mE#Nlv-ST#wfO%@)SrABbgeu2zSZYG7
z3%6@(eOsM$UUjM$r_~#XLL%6E6885K{rw}CUoV?w`+ooc0RR8h*=x`M000I_L_t&o
Y0J;rYh;KsZ4*&oF07*qoM6N<$g4^q)SpWb4

diff --git a/static/applocation/qdhm.png b/static/applocation/qdhm.png
deleted file mode 100644
index af33e49be9bc9bb5d2329ce25e2fa298e79402c7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1111
zcmV-d1gQIoP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000CGNkl<ZcmeE~
zKWG#|6vn^1!YV?rij7#rMw?4z6G^}(f?$dWf=vRJ7AaF$TBOq=rFdxs!GHz?(})4n
zXp=OtF-5dWqh689W}P3y;NEh#Z}yx!T)iXj=H}lw-}l~|x2sLL&wM+(IM>eJ%{|S2
zILrQeYiBRv?5L~Bk1W%^GR;exR2@E<7U2wcBJjv@t_N{PH1{`|N$sXnvX~pJ*UwBX
zB2X{V-E1f8E<j@e-4PvqZybTq`@H+a|1Sa)XQYK`CAZd;1a`N7?Ot>Q0Kb1#dVN<~
zyO!P_-;kc%l9p#|()krp0wB);OP8gC6Y0TQY4uH7TYv9qEw{XLe9!)l5`b5x&q<s6
zp7h>VF9b2EZ0AV2^FrD>^y!JSZ2GbvWK$CoU^}0kfP)ywKU=fu&Nw+$bSjw<!1GYT
z>$JnR)1MN~B5iS=bzZc9qwf|}x_Kf1S`q;ORWUrroq2d&;^Na%cB^1iS!+fhfW>%&
zbbEf=<!?)(uCr(Mg0CuwL0rHqYp2eZ&34b30?0|WKmc-(qF*$|S;Klt?9FGss?bus
z5JWVJ`||yTOa3`SDb0_U{Wb+`ee$Jq>(D<bAqm+cC<O5^<SDIT9zhfUTGo(GSeOqj
zV{5Y#>oz|4GxIoMU9mL<umPZrkNyD$dCDr|d83Zw?Qj9}bEFaC7~?6<6Fu}9!?-u>
zy|?Y21<q-l$+%@v0s;u27@-bhw1^@yOILi97|R>Aoit*M{gA}d^f3g2!J7OybCy*S
z0NByDZjv0%I}GVT?()0nUG^b@2$5oVnz3ME{UD{fvH&VX(MxzW9L`)I6bRBHl=R_u
zKO+kL=K76S5<r=R$ljOVa9mJc?zni2_99PoAkTi*6b%f7lY+%Lt8WT`5Tv<e<T>Fd
z9g4t2fgHw*lv~z9nihi~=~LWCpE>p-l)an>4s({70;o9DZ}OWofdnFY0V9kzO5SDg
zHl-0FkmKU^+Xoiqnsuz_JcNM3T$z~y!e-K>jC@!J$@M*n3p?NT4>N?}<*=q-%Q_su
zD>Z9~K5dyr3&8tjK&j?%K$Wvh0WqFSMSc(*Q$X+r7i*9M2HDd(?{|f>eXsX-lmMbY
ziHpg}-p9m`a*3%%R5i}EcA5eJ3DtqJ$N?7Upz~l;a%saq@+~Y=005!HkwzSV5Xx#w
z1C!T~K%UFY*_K5K0E7~UR{*BI^I%J9V3PBcYTj%)GsdC?00uAzP~)lBDGf}p$$id>
zwMqg4DEER$q%<%CewB700aXqd_S&(4VSCuZA5H|UQxner69PI39WrvLrW$hpAFNt_
z8q#*teXTh5b&NvCIe)deyV5vrG&JMvl@n5jzmDU&>uhFsrE&ZV00960eVVL`00006
dNkl<Z0|2`iO@m)Tv+n=^002ovPDHLkV1g2T1Z)5R

diff --git a/static/applocation/spdhq.png b/static/applocation/spdhq.png
deleted file mode 100644
index 281468f75210a1391e67974f1ca1be6b72299eb6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 792
zcmV+z1LypSP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0008bNkl<ZcmeE~
zv2W8r6vn@JU@B6?6c%783oOaR64Xd6MM9!Ok&sv#iIJgW{{RLy7&;=tf`kMTR6>G{
zNOXavUDz@drY=B+PAukrwJKj-yE*q9$3}_rn&<b<@4oN7cjt2hnNM#JURfH1pO;>Q
ze~g5cmqGXr%m%swlrYqeLiHpyRfkWg6)=OH3OqHK>jB&VwZ6?z8U%*Pie;>q8mdhN
z>IM2Z+GgDeXingGMa#dMSKzEUU%Vi#UXz~PmNvR)jiU0_Kx;u-UX(U&N*^9b&+kf)
zZb<Ex)V*9m0t@F1uuBoh*Y_j@@Q}b~L*^PHw#`*9bPWJvtrN8cS$=#=hiyXk(*W%s
z#8&Q&uiP~+0(Kt*n0{Vs>#!}75DxxIyZh4H@6!55>CP+Z$(MLk`(mu;(Q*->)U*Jt
z0ARb1@!1mtc>AZc`85K3|4sC}`7I)X-yTl|k}+(5mhMD=#YPVU8t{-{G633bz$5^}
zPNqk{B*p=b9f#`JvV4_0Vj;Hek3HF%69Fbq>*MVoQj!3GyJqpS7A6Uau%RXIvwc~*
z6M?Lot6-lKm~|DrDzJK8Vk?~`i5vt@!UQ~v_N1pgix&a*_|fn3z^2XQMSwjYNek>_
zBPq%4IV+wQfvliDc7Q+Jl6Z2v#Hkzsp5QLPkH&ZrXq}Ia3P-_;_@#aF#PK4)Q6TMz
zkq1C>EIV7$cG|TUftNc{-i)0F1|QFsJW25)z=TB$;CZj$0O=CDas&Vk36AjSlcbUa
zCV{s7UIcg{AzOC9vUM*4ylK^%01us_ccHu$^r`^hr*Rg_L&A$do{6S4c1~bgnRSip
zRDs?=N|R5c=$}<-z9MWcB%BDi1e(>DIf2y7muUPiDljfFVTDf>sG(ie^wW^G0`sSD
z@Yk^lW0U;#VAyZ$H5%#|d2fi+;X5{1hekTXeq-++00030|9JVw0{{R321!IgR09B>
WSS@t^5N$gE0000<MNUMnLSTYaTV`zl

diff --git a/static/applocation/sppt.png b/static/applocation/sppt.png
deleted file mode 100644
index 2f822a99e7d394f1645a58f1ae5f1d878c2305c9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1084
zcmV-C1jGA@P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000B=Nkl<ZcmeE~
zF>Dht6o&s~U@B4tOIZ*@S(wrV7EmLx6bXqAAR)0d5@Uys3>_J|!O#(rE=WjJf=Wnq
z0V0tFmS%y4426X*K!#2%$NOqIT+@Wu7ZTk8QQp~SzxVwAe$T%1m1VzbJvlR9PhQVI
zOum~WxtDtK6wC%)WhzOc9VMztnpP2hi59^Ob|P@kFc$;30Zsj<6RBP{CX1=YVpS7W
zh(NJGA4WS}bOQQM;BZ7IfA{Z1;NofN`Z;N-qOQ<3b!_spo*pqM0+ku*?qzBDf`Om=
zCA2-bCe5BmyPRx2h(P<BwE14z*pb%WI9Y!yZGV(zrldQUCJQ<}S`dN#AJY0eBhWI?
zZ6})_+&#`>BS6|M%u1vn_M=D;fqnxp^Y^c~9wNc|KxlWZN3WzJHqURlsF8w?Z|ES3
zN43LRG80&`wE$SaS5CS0!5U#rK*SFZXmkM$c<zZPDcSt&z|)Q|Zxd5yCIAoyT5C$A
zMDvrSmaPfu5b>Y@M!L}6+H>pY<`b8atS8nNI_RT=&lt%}U~k_I12_P!zA|t|X7!~+
z9|Va8pjKW;S071~+qQ;?0M?YWjY1-d0AQG1o(1ekfM5rrjgncMIW9qney>j-b@Y2B
zO@hq;AA@vzZMhF7fOBS){9ZUKkq&^w2~j|p_2u(AcwTJSjs=l)G_Xa#S0Ldd$2bt~
z)fsdjM1UD##~@e9_1jy{9UyrgxI2kd01QB}0X!ri$~}>Sq}NZE=#oy9Y_Fjtf(S4x
z9z3}Y$n@aU*-_Y8s3U0|i26Q!(ce!14+(6ED5U%8rQ3oCI0FgCzV1sFB?J3eV^9y)
z>ri@I`new@_(JF(ri)G#0StNtV9XlN1HUeKYWM1e-UFH_;nx%So$bg3aLzzH4<JIi
z(3VvIk8SG<*WvO<2n-)4T*EJNq8Vb9KLYkz0&sRT%3+c_0^Jm{*N$P}>CY7bz_W-$
z(<gTXeEzq;0xe8(6#-t$fnC@LkU|g$UBKw(CIY;wAUsnLz=cR|2y|yZBL5+n8v=d-
z$K-#m2+W=Yjyq?#TG%yL5#R+bW&uMniU7w&jIxNg1thQD9D01(_%aqeID!b^n1LCH
z?>Je60}2Cj@Zm_x>5TI)pIbQX(Z?$}WsC$706eeCY;SCJSp**(Kk)%j4m~VbUL63;
zv6I6Q^%w~vfJ36d`IgTkl(B*xpCj=_6gc!SDb>3B<dXFq5ln!A5oVHEj1_FhA<+cJ
z0b&%N;~_8#qDb4nf<PydbgtCPD#<<qs*t~uv{klC&CnMy3LTsLm2#t2+AWndXY$O5
z6ye`7tPPX7My<5_6954J|42+dEC2ui21!IgR09ABr0;Z_m5W{g0000<MNUMnLSTY_
C^VCfM

diff --git a/static/applocation/sryl.png b/static/applocation/sryl.png
deleted file mode 100644
index 68e10fc00abae9548950012de42c369e1e7c1caf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1082
zcmV-A1jYM_P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000B;Nkl<ZcmeF#
zKWrRD6bA6`uAmB%1&u49Fby<z15HpO(S(W=K|-RjCCU^jDJUt@L6H*Slt@H^NJykX
zSi%i7aRUu50u8B%i&Qkr{=6D#9g(};y;~=jc;(MCJAdAM-+OOoc5j;cy0}}tc44>r
z>B3jlgBsOSkKO89oNMZts#I0(rpm=6YgvV>%4M8!7lF@f&Z|MZCffR2tCHPmt>kj6
zakZ*dHbr2yNS|c8w(0_MCg5a5Pyg;L0<(O+xt@IaexjT;ZjrvxBCx%ceDPkg@lta2
z?L{cgo;!+w^>fMgW^(^wa_5g6ix?{kqX;NuZ~c}WK4?5hR8w2-|4{_&|CK!aw@IC=
zZ#DIU`^zO>tc@Z7dEQrox^yawF0&j(Kp}`cl>0HtQ3Z@a_)(in5#XV{w2`#2@p5wR
zg&ae@-KTEOqhyBMFD$@b51+h~v~m8GhCC7K?LKvLK6`fv<&$$35>PxT&+RgOfCgcp
zJ`@WHD0}<C-^sNf`oRH*w3Avn6g>nyehCqHeDAnDOA#<G#o5-MKLOq{zyB!N+ey^<
z=hExVy|%6}$6PkdVN+dOAM}cVU1xi<*&h2W(q*jec8KkM0%}hqbMtQU;WrIFzFogE
zA2zSfcB0a*y!CrxYi*C$Zk+cceTV<#__f=+lAVbVYji~~0mZ1r3Z#O_*is!(b|ih;
zue^~saixZSea1M%uDsdw*+%t&IbVN}ULQb%1QbFRMY0Gh_e$xYorjgiAy1Hd-WP@I
zKPNYSNz~h8%Y0*JVUPd>d5R|)=W#^TiSr$-E+wQ3vQSQ4W3}J-wMjpzrY;?&o4KN)
zoQFXI5N4PVB@f=Ip93V_%VT419yA{_$Rb(#i4+ZjL<FRvHmSvi(_J|ag9PvrQpJ<L
zz$~Qg(;pM<yh()if<lULguTp(A|S7gc;h`U%6S+hfKlFTdtDn4qkR?u`7XWKAQI%i
zcJtZkiopW9F3=uVL>;Heq|X2P7Yoq>f_yhfD|3ib&cmq+K%BQhx=0)81AaU5EQkaY
zAy1V6x$ikBhna`p^8}*cxd8&#Uz|t1>F*Q)4;JqzO=H}BUr3AduQs2a>UJhO6_n>j
zG<aW1S!*6T31AeQnhZK*-1i0V@Bi6+dOAn!LTpJNwzP4Ih!AA0dFUj-qQbf;c>Vf*
z^X0~-h&r%%Tzc7oY{eonk9g_tB!EGAyC?{-u+qtkY}=+YM4vHT(Mdp8V^3n-nSlTG
z`YAR(6A?H%MTaeYsc9yuUwX5WSN%G5ds_die_zNdM&YP-{<Z1e&g9-?lC2uwWi_s&
zn(JPTt-YPez5f6J0RR6fYMLPc000I_L_t&o0O(9jgY8e1&j0`b07*qoM6N<$g0wpV
AKmY&$

diff --git a/static/applocation/super_vip.png b/static/applocation/super_vip.png
deleted file mode 100644
index 2c3732100aef5800a0af6f0feebcb29b362a9c57..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1157
zcmV;01bX|4P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000C!Nkl<ZcmeF0
zTWnQD6o$X<f~7$~MI<UFY9-Qw7sOkPrdEU1lqRhetok60koaJtZ~9=2K4>7(_@WUL
z#Rf#Hm7stTd=QPPKA@2ZC0ql6kU+R!%YC!{Gd*c(piFyaN)PGD{%6l^ul4`4XU|@H
zPJ;a&o12!E&rO#Yju_H@j$`Ftri&^X)A2@~MC47y-&UAn7;5P6M==G|oIT555|Jb+
z?;GRchI~7Qn}}J7sj192=AHOfBvvRk<m)k10`ir7hWCJg%rIQWWZ({H@QVsz{0&e#
z3I<zVb$x{-S4Xv_u&^FJt%A?&RoFZYUb-8G73FH#@A{ksRNo1&KMYr2)#2=#Auw|i
zNXV-Xz{ui`wivly3lPy6MpUH!*b3F(KwT3wt%f5fVaOn;pJ3&w@aCg%^Dy-ck6sIC
zm<S_^;P46f*di&N_qM^Df8hD=?Yt5W94GTkJTn&N)xo<JFz))WB9h*iE4dD)*!0o0
zjjJ3{<+C_?%0_+-Of?}Nw!n@<P*?zu-)h3DVfJL0bW^r>Zs#5eC@>OZEbM#jK{A9i
z>g)E98C8vJSCm`}oA$v6f5O7GZfc3{Lu25hN++h=L}jnLWdz6vJ@|PGxZg%>UM+lW
zQ(@wb&VyDOtv+*XRJ()v)Rl4G!!8RV{+>;%?6vcsC1YQ{)b0Z>0TXPEpZyeQgnW$V
z(nk;bESq9_r})_M67b4>Zpv&u01ZFF)AQqC`Xbo89|k2LpTPu_*&UFvFaCus=HU2g
zhye{y<A3r5_l$PuOQojuQe8lyf_iCv*EuG%Fvz}dNa7_x2BCkZK?NuV`lJd*U0`cq
zwAHEYg}cHIL{I@w+y+{)B%~|N7cIb3+mp9<ZON@1RKSw;j!cz>4hl0|2^2R~-r-8i
zHo9}DG^l{(o88-151_*AEXkTuGQpi<qoo_NwPDUd1+-ZVq>w?>YVFM{A&N?C#;FE=
zHu742T`5c&RDdWgUI(Ynkcm_^l_r<CDWtmQR`m#r-~tp<FWcluD*mZ&Uv+-9>7^;;
zTEeBl1&EraQJT8gNwLit%Qsngt+vpJB0wQQ%k~bcD|f*5gB|6NxhMie@P|(GeZl{#
ziGyeYR_%n(?ekJty(<oRS&b$@#=o@>d_nnG@DiXUPy{+}pQs!I#e<#ItWQ_Ec<Lpf
zb+<F{^1Vdc9+3wHeDb0E+IFAHcLy&4`pD2yICdl~cn*GVh=cE@xeWsO`l|iIraSU#
z^Aey3@}1vc_fcIE7xE!r^6BHrOMncuY=in{nDG<5@k<=cT<m<vmwfubTY!w|)@q+e
zqZ0!g_kw)LmoIuGz}IMB_8Smz!O`x+$}8dy^ugj7?UuCZ4y=e~KDObM<w=t8mie(A
zd`t7|IFuCfcCuo6L92;)gcRGh#r|WVzyCDlmx{Bvp925@|Nk(eBM<-p00v1!K~w_(
X{@e<PO~fTO00000NkvXXu0mjfCgm`B

diff --git a/static/applocation/syyl.png b/static/applocation/syyl.png
deleted file mode 100644
index 9d53557f43c11af8aa76f99b6d787b27a907b998..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 777
zcmV+k1NQuhP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0008MNkl<ZcmeEL
zAxs=W6n(p*3UR4IH5I6;J5|#LlA2Z((I!o5IA4LRsI0)X0@?JCO-j;|kbogv0tO5i
zFdzsD1t(CLVIGqo?vmY|e>==_3%9wqGdnvo|GocbcV_2O*kh(+o=<no=JaoKVPQrd
z9rKTzEp?>K7=t|+%m8Sh4u`=kIg>jh@WXPh2XRZZ@7FLuC$&mu`wHuoHE1#d^&&mU
zwo!Kh7z-GTX!Tc*F9MSjKuio9LsbMOo&aB81FN5bKOf_w+jh2SQzJ$t;O9Hw?G&Kx
zRAacP4sCsZQ&i*jo>xF~5}11G8Y~|G-!_2xwRl)Ra<*ufa98<fl>j!syaE<?f$dXZ
z|12IBwrR~l9OtgG&t3u2i~=NIRjL`XY5`?P(}R3tm1(PO6HNfe@2~d&UjSM%W$Hx}
zAfA`B3^`4kXab6iGddhzMRm0IDi^?ra9DA8F|Q?>SMOc~2$_lnh}qFfgCjsMa@v3O
z?0$p=3;6H?Ao(vZYbro9TgH?Y9D$hRG<}Z+$RbZtpVzeYeErD%;0UZAyQQ_P<E3L+
zb}#NoiA#^q0oIlKuC)9)SO5v}184bgkOV!QRnA&m^Yg=q`A`H42qh5O-YbBfq!CV7
z1oJV`Z$oSs+4BnE7?+N?2#XCa@`Ny-6UpbLUI8S(wC9@BJ6sCKgiMUId3NdS7M;BU
z*q9IKr@sJqB^Z&Ipbb9!OZ&9!he`mup*OfIv9JZi1Z{BFgElo#3&`tiuH|;pxN|ow
z*fy_UZF!IYJ_~bA-0a$MH*Hw3ZRn?EkN{3%oK+d}GT>W=eQ3R%RWC>Y-%y-Y`OuZY
zUChQo0<t_(b=g=zrpGHRd=L@nRp_ugH<coRa?-}g9SN|K+LQfP3U!P^&pLlT?Y5JX
zBtgsKKk9MxEZ43@tJ_Xat^oi5|Nj~u%E|x$00v1!K~w_(D8d1QEM-kf00000NkvXX
Hu0mjf9oA9V

diff --git a/static/applocation/tcgg.png b/static/applocation/tcgg.png
deleted file mode 100644
index 80e665fa5d6a75e8c150649792b9f4571c3084af..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1039
zcmV+q1n~QbP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000BTNkl<ZcmeE~
zKWG#|6vn^1!YW13CN^r3N}EfgO(X#u1;G>%1e*jbQ>3)8v`D8#O7YSNf&mQ(rV$Uk
zMw_J3#w()LHR^$>Y}WbR<iVcY?ai9o$*tUxw==st^XB{BznM){?zdP^E-ciOcMDIG
zpH7momwNIN%nrJ$bdp4SO0+0xT4nepS^_iJ@xUX8xg5Y9(A3{_BGs#o$x`ZJxw?sJ
zc%WRMd(lppoq#3;dOaHdZsLLXHt$_A*aK6ir0cUPOlmW|z(VhW2&~LWukT9tuNEhd
zZ%EH?OEXiU(EYff1OUHM^MhMIq}|r&rTI;2AF2!f$t`L2v|lgenn?g_82GI{>E4dC
z@qYC3;H`A$g*ObLx^^W5x*wBCz~XYhEp6@l2}NEvKS+naCDz4wA!}t4FeR<;A*zl)
z2Ji@)Y;F2kl1acO*3K4}ynh!4Ldez)X@dxmR7IB1wC+L(G{25MaR(Ix3!xC}GbYFb
zMU~HfCAkm+FdbJ3@_+{)=SsNZaW=M)6;Ff!iMo7IdU(wrAJ~2AlgyhR{f0TV1ePy(
z(CoJJ=hQtuQ03@TQaKNCA7XvRMD+mYs<q1!9w1q_KS}Jq$nF=v3$uaY5xfDwVG@l1
zfb3iaaLzu2%l2mp*=YLEfe4`S5M=0QNfZJA!TJE<PzZ25z<pYXdx&s4#Y==#`hCBC
z6ascQ1K^-TA!CSt!iP-`f;@wKKj8K(3W53aemM&dk~9sB#O8yBXOILurIcBapdBPZ
z1aRjd1tHIEKA-@Jl?^aqLSmzb+~C`Qe)|_!U!{Dn|22~UmSEcK8Ls~>rUxSQu`)ym
z8Iqf4R3dUC?<$!DIIEx>H(C<rU4ZdvYogDr+<oUhCD-5hO2oa18I6xAd)BYbB*0=+
z4JJ|ou^6ro6(dbmK?kvp7YHRtU?4tIx#ztJ1|v`K)UgPluv??ucQDFuJIX_a@IVJ3
z5WuHNS+!w|31i3$?k(x*50Xp|*d#2)#)GT#2-Y<nfW-)$fgk};duJ^MBEf0#%Ak^K
z<7tBkFc86td4v#T9s+pC(-MvV#nSW<!jcdLJZmtPdBY?Zfnmyqy$3wN2n~P|Vt4}~
zEFnxaVhsIZ`gk9e01HBb<HF5n5<m$pgmB{-ImftAiB7<PVPQgr{6dI%dzYs@F#>r&
zW{sT?$g)n1cg1)h2J)jd{tE(~BQm9Is;Vf$Kh9OiuOjVK-DTBjFQXSa&iL!q#%krD
zQqi1~SB^*-{yGk8!^vD@wQ}$W00960VIIXJ00006Nkl<Z0|4{xhl7E>^P2zw002ov
JPDHLkV1nf=)ldKc

diff --git a/static/applocation/tctg.png b/static/applocation/tctg.png
deleted file mode 100644
index 37dd2fc69f3442813c523461e6ae7deb92cfa27a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 857
zcmV-f1E&0mP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0009HNkl<ZcmeE}
zFKiS+7{%YNKvi5&RRmFoxierOZGwS>gbGNIy#!fNi9jN7ASwx0Lqb9msG^2&2{mAP
z1`HJi!znmX3}%=glL>bh=*{fSZoBPW?(OXE%+B}T_h)A|m;Ehu%=yKRdAs=3{ID>`
z9v$-%&X&4zPK?p6jFu!dREM9@GMwQ~1Rhz=^&oDE4*eTO>f~0*^3ctCof<WXK)pzh
zvTf8|fMx<lBU=5{ECSX0eAHr81e){GwFQ-mg|njsCtU>#SZPU*uS@r?l#3@fC2UP1
z?)!rT;Q5uNwE0oG^P*gA>`K_erYCt=8!UiH);~!7gK!Wr5cACDCoD<xbFQ6q3=-fc
znLFdp!rI<9CpK)f8x?CKN&xvEQ^dW#wEbC8MUM?9CF~d_fHwpN$^<sTsJl^70?IC6
z=D+dG5eq#=31HHgf-Eu?8!?C$5HoodV^5QSIDfJbJ-;o1*uspllsp0~Ko73EZO6ec
zM}_SHZ!Y@Wopi^f0&ZQ9AdC0c-%EG5+_r=50qX~=GHp8gO7lgAXCc0NQDXIlxZe^$
zcBAKn&_^UlE1scmS|o`89w*O9nVqly-agRR|LN$mT{u<(w)dQecfPo-HXa^MmCNT`
zYO%{?3=v|R;p9wrOcDVouxKF!Pvc!ug`5WzHTUTIUxb*W2$BdOB|Kq-ti6^VzSEyA
zF~sk`aS=iQ;{f-I5FURfi2!QArwkuGqzBPpZv(v75rqiG^2|7yBG*X-K#;t~`*@cc
z81^vdq!K^?5kg=Q!sE{*5x}H--(8yEWv&r{nAJ;vS7X)&B0_{1lLE;Ecrthvl8_}$
zNEa3|?hUUEe*Cm;asi$YWJwi>vyhQGzAt54ngB>r6J-%+eh?*qVyprX3q_Ow3bP7?
zl4o3y01A`0OO@c&48chV5<o5^qDq9;PLO~}UO3ABnSi78KDNt=05eyF6Cq$wk+VuM
zlPi<`<W?<znY5MLL))^iV-yC~`D=N%o$Y6tS{ARYkUIPamTT9d)oo|{zX1RM|Nj8N
j(NX{a00v1!K~w_(qls^Wk&IY)00000NkvXXu0mjfX#;l|

diff --git a/static/applocation/tshdxx.png b/static/applocation/tshdxx.png
deleted file mode 100644
index 0c89aa521f6a7817a13b19da427a0db53c4770fa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 896
zcmV-`1AqL9P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0009uNkl<ZcmeE~
zF>KR76o!9$VCoRT(g`tSVoD|!P$RK`ghU6BkXRatk)b04BLf=@jEHnWLZT8>LZS;I
z5=<=Z0t*=`rY=B+PAtcLx>|Lt#P!AJq;3=C*}i+v_x}IAclMoQ*<Yt;F0J&;=apCH
zuN8CRrDxuO*+N&$g)!QZQAbikb@&;rf*I^&;F-l-58xJP>fbO@FSblpQ=Rp?G-{E7
zdVwBA+o(GMEeMQeboQ-924)}gQIC~mV0lS;epC8zUwU&_T5FFw4cV%M0N`88(%_GS
zy4I2q*9v<KN&wJ+Cj;9*rS*@}y|<1CS$K3!LKl)k5CTi*q=#2r*+61<U)ua}1ao7@
zk+{)xC3WZWk*@4j5CTLUPyi?5L_R4W0Dk=?J=l^Sf0FhO99c4guB?<MK;)a}C87*)
z0H#5q!-mp<NMggBAX{nMX|78V02Gl2^v3RZ_khHPrx9mtA#w0eVor>|t9WlI0!bM>
z{W94ha{<5rCld*Y&F^kPLvZrl$7@Ovz&XIE{XAFb(<GSm^l{JCiyWtysR;mr5*qw2
z<{Y9-;_ZP%`6L9I7mD3K$*L3q1_cb~BEpj?U2c#na$lZ}2Z6j{=BHZ_m|yIj=S2ow
z9OidCn;GC8z#50R`#eUm&kExp+5Vz!uM7bE$#u8W;tY6}3Pqh|?O0AQ=F8hszw6dU
zw6k`3Z7%|>Wq9@T7R5PB<T5WK$n#=jELN)Q7x0k>IIHs_fCIp@u6gmzt?jb|`nFkG
zFc!-U-qZxhXACa_J_Ao<OG#E*LV#kzv5v1oSRCTRN4zpXx`_~_RE0o*`A``FCfu#p
z?n?uE->fh{aLydb>gYp<O;(p~Gas-kDqb02Q0kN?&p2UUj7{<+No>-6d~Qkl$DOhD
z5pM!{gA-jyFi+S6^R)uuIZq!t$}n#XUtLfFIA?QDsX>M<C%}0;QbOpk2`Rw|0FEdF
zxYLuEGh9OmU1+I<KxmM8<1Gl}MQ0YeYBDej<cB^^1%crqnOdG=MVjzgRww=!Nn5c!
z*u9YIn1!JY{(9W+Mtf1Dww3p)$8Tt{_N}!0-DvMW00030|2!lobpQYW21!IgR09C)
Wg{5>!EwKy$0000<MNUMnLSTZTQH}=y

diff --git a/static/applocation/wxgzh.png b/static/applocation/wxgzh.png
deleted file mode 100644
index f376ddcec0d1581b7020805d64f49e1afc277a01..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1049
zcmV+!1m^pRP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000BdNkl<ZcmeF0
zF-#Oe6o&u1!U_{&g^jVmMw_G21_Ox=CMHr~Vqyb{B?Tpgr3IZ9l*XemF_A<`Or$Yh
z;x*bpqm2}(g;YvGrNug5#$|Vh-JRKmyKv?%%+AbvZ)X1gy*D$vp(*p5ZbuiV+R?kI
zr_nD{qElbm(MvEJ=xWl4B5f(sw4_lD!Y|S+n88j29vRGo0o(vh{f$OayJ?urri6pl
zjMO3mg9SQ^c687QXh<L%(f;>_5$M0qvn!rR1ja@rN^8v4*(G}0t3_bsj5K*cdU!*6
zeNTFR$Ck%8ZQWUrp4^reul1f#Wdbwf79`*y0hv4>kDrs~E?e8>>%AiqOaP#O1`O>y
z&_yyx6A=g%+0>N>5dbjhfye7E#2lp5{6yUu^2Y@cU{O*cJ;lLqX>&)~J4j2Dc9DL*
zC9&BP%j31Y1X#=sJ)rNtkXGJH58fUH;M3Ph!=tNMiI>3K6>FG&k`C#<+xF=>a@iN|
zxH^3=fxNs2Ae$0Tva#KTi}XZhd(WmGHtx7O{ZayM-lrFcy-1yw$8F?z8K7%h()|sI
zdgrHvtaaYrBgfqnr36?g22`i+ewCKqNMmOuPB9|Jej=*uEou%3bX<lIuDVVs0YaWk
zSgnP(yWcHvfccz3#2^R}+M%m?32+>SP8Qp3evuCTNXwHpU1E7i4R|6#9b#WffC&IY
z9a@MQ_rv1V><AozE-SS?R}OfhVYTH?FM;*X#+&BSDxW6NZvT*GE+zfA#a`g<SpO7D
zY)v0IdMmL{_6VtGd&N&L0lY&#7f+GZ;QhRX5BESLYp;KOHoBw9b%bl<CBOipP=y3z
z+(KUS>dh&X*3n1Keo4z|69wwB5=4Lr*0$|APP?d(=j3mZ{xAxTL6ID@viZ;l6Tlb}
z+@!Sg3P2!{r>iR?h0DfPB7isIutJ0lNSy}lTd)j_t7C3g=JqQQ;O1mfP7KQGM|;!W
zdL~V`ZQ)e`8+V~P{g5NP5`peF3)lyc*X(pu>VPM@oM^tWl?a5U2X?C;d`lPWi6Z;0
z*dozXB9IL8x9}bxJCN~PCl;g)=@}Zqo)G|2oN|DoA5tJ53ZD6TN`M83z)DwQqZ1Kw
z8)6i|l4{7~i;{zaaiOK>1Y#g~70{eq0H(0nx#f|Q^Sl#b7mo?4`$ixH4AFu}h;3|h
zstClOs?<XQRlL;;+hGK9z1m0Ne-VNGK055gmui}CQuD2K;`8=pLi0Jj(KHY94<QX=
z6!wktmztf0#%`mb2~%EaFn;?6YsZv{&O&4NF8}}l|Nly<KOX=900v1!K~w_()E|*_
THyp2%00000NkvXXu0mjfX_?^E

diff --git a/static/applocation/xffx.png b/static/applocation/xffx.png
deleted file mode 100644
index de19d00589c46aef568e0b3d89ac383c4774baaf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1146
zcmV-=1cm#FP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000CpNkl<ZcmeE~
zKTH%s6vn^1!is`eQK<zs+CZZX1`-=gOr*fX#0C;e3Q7x03py<*jYnf*B8ifiNMpQ2
z8f~D_Mhdi%N-3yp*7>o%+_3DQ*=4!hn!DWFoqap+z3+STW_EVla=)2QbZNR1eVBe8
z{dN)!ymX@1V0O^erV&NjR-_q8qiVu0(j1t<&Imkln41CI0rmc)k<@8BCUc&$S<Ofj
zj6kzMA4fadbOIU@I6k8Nzp8BnM$SpI<I>V~>G4hJ>8+lio4O#;r*4X;CNMD;1ATj6
zdU!*czajw^y$L!<p&u9mWD`(i8lXG-(%QDP{7$<4LYnEsLL1%cCuwuHZuqJ;iO0`N
z&+f#T1~>qbwH=A;!#_Qsw9&19?dj@ll`bK`ll8HYUd91fC#W*MN)Z4w;3=P#kB)%L
zc$r{l(YF)<1AkWaT!mmTfrUwl5!n1DW!3Zi)#9ZRKUIKc*#r>)IBWd=VRqTDL@r&6
zm(r|YfM1x9kgPss^+5z!CLyu)U4lefkgXr_3Iq|>{bV2P0gipv2qtYpu7e0r8aOKo
z%*1BdB+~%K#)SDp+xpP1LkbD7;;?k?{>sk20U^5p#D=G`>5b6(mw1#+U&pzS0N@F<
z^OIw?0GfHi86uP&B-jU0I%Y}Re45VA*r%1B-A_9g60lO(KTI?4=>QI3#B7p)C`Cpi
zivaf!v+sG&ZWR(RQ)=7VX=m<JKE5y#^ktjj3lko_F9zHa;or+^2NTG1!aWGES@XpR
zu+{K|zSx+MaZ1asDZkKCDkNaR2x0-!&fM=VO1=PuzP^q&rG?&v>|5K;=<sRRS?59m
ztUefrIP<ei+sM=Q#YP6d%!ec)`Vu#(r+-ok2@njKx|lRQeoY_0&S?XJUbKAyAbNy8
z_U?cW#QL&5r%#>~62O@K50lGE0$tsLZ$`OjxlYCnBk=D{in>fXsOx(6a_lK2>v7Nc
z7({?!WfaH~5}Vd{#3%Jm3}Th>97F(ztDhw%CGWuuHM$~s^j^C6D!&)Lc=+MFZ1(XS
zOn?A9q?ikA%m|EwJi#U}qxiCf@RF3*H!Dss0UYoI<;w%$LrGwlCgy`>6rVf*)A|+Z
zN)f;r!%RQ}K<%P0BiQg&!@%RSjJ@BtGy#kW_+W!p{08>&u8zLSK`PdsJW?)f4;VSC
zdDeS;o$MX1sYC$xJb;*>%nPmo1rah!U9*iw(4*ta9oLq165v13@KHr76R=>^E<{*y
zSO(FvERt=6S4?!g%#d-u)RA>2IQrAdsR<YWCiu#hL}meL+XLF@ScdD!xW%(`Z3N6=
zzt2Mg{mytY-f#qx89BP{<Ke#;frCCKtoBfCwKM=<`BmxHk~Z4z;JziOiKB4flE2*U
zF1GesEloOkqh|aL9M-Or$?jrn?=JuV0RR63eCy=^000I_L_t&o0GJ2sbRjz{q5uE@
M07*qoM6N<$f>S~sj{pDw

diff --git a/static/applocation/xfzq.png b/static/applocation/xfzq.png
deleted file mode 100644
index ad0744c44c9452e4f71129ef9ef4f7784133fd78..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 857
zcmV-f1E&0mP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0009HNkl<ZcmeE}
zA&e726o&s+ppK+L6+;lkfN2dF$Th(n2?-~T1bI!6Cr%=e2pou$gknfYxCBmtAvEC(
zn5zL*abP$DRGh*r^RbyQ-EO-(d$-#z*QWo@?3<al|Nq|GnYJqPX?KJ3%iZAp^3&j#
zK`{5|2Cv|3sH;jR2(+g_ZAmqi;S*>T&TuCKj|}H>5I01fZ!M6zRik9pF_x<vs7VIO
zMS7HNt?UA{5HOn2;_nt2C_d(+Ph4bRG#<s@rOv?8DXG4sT#-e7DgkSkq!+h~!PRqq
zG7<%>G^CBo5*hGw?LV6g-@6uOIqm9X0T<G`I-Yq1$|nnn0*;54pBF@=T``ve(voN1
z$rNzsrPS_@1N-4`;!+&EGjMPyfjElTLEKngHV*+I1-7~e*QNEQ#_;%t)HoB)E9&Yk
z0Ag%&>n$T7f@Ymje~>khrTj7p@TWMw0<zEcq?^wr-W@>y?vAwmWqkf5%S;6H4?@xq
z<)r8I1shkw6CZJt2uJOO3!qf)zYBjZJh>%78WCXaqQrZIn6!tPw*aC;y5qLdsEtTR
zBewY_j4~Sm8$xuPd&DqKKM9!x5XB_Nj1PWt{RafGmJPrqPu=f+3(LyRW<vn>ep2f#
zfCt+&lj>=pB-{t@ehs5fgsr{*Jv>(^D{Hf@JI~spt+xOi5E+~&fw?Xyzi4eY&q|aF
zJ_(FFzkb@ii|=O=5br9Rm9l#HL89E^vXJDpPyw9MyaT`zvyo?vUCG*M2S2z@N1^~~
zbh?Z5qbugm5hb+!d2|gn##}2RIVW6OTt86&PDpRuVqe=|qK)vRbwyaa^~bxi^)Y<8
zt!+}9C;(?{bJQobdQ`AoLT2legfAk^y#?<CXN8?-?UUL>0d^q{-wvds!X=C^4n=+g
z*%tCX8BZ<13dy4-%Lt?O^*<K^d`Y|W7XsX9%%Z=@z$~KfJ~N*TxKGHr|6d3g<{YG4
z-B(pnUnTuiq@Aj{bPWG8W?^W8zgg{dD*Kg+S_ZF;kTQIShHKBD)$3ID{{R30|Nn{Q
j<Y@o^00v1!K~w_(Ss$Tv_i6Wr00000NkvXXu0mjf?8}CI

diff --git a/static/applocation/xklj.png b/static/applocation/xklj.png
deleted file mode 100644
index d4ea83cbe0009e85ef7bf67fa0ebb5290e1e866d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1142
zcmV-+1d02JP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000ClNkl<ZcmeF#
zF>D+~6b9gTS3u*!q6!UAga#VBfhH)CXhKDbAR*Dj5@m{%6e%gvL6H*Slt@H^NJyjs
zEa3*4xPb;2fd)5#C0s$VneW!4tXFsE-J88Am*nLCX7<hOoByAAZ)VQpNS_Pa)hp+>
zs~^sPUj36$J@(kHzQQ?CkFiQs#l5KFLPV^`DtxNAgfs3|;FH98HHasojlcCOVtbsF
zTxu9st6If|6<96OC)uvAx`22(1*|<6ab_(B1)nFQquW#O6}Wgd;+qd5zIbm~@Ok;Q
zZls&N`U`k9V*l@m8$S+<gQJLzGfisU>b(VUd-Pw#-Th%fz}oY?_rpR0`VFz%-p>Rq
zcYaUz{zz897AZk(y=PxIom8J5#R4+9d4nST={pfuHX}ZJw=U=P@6%Q+;G?%9K7KnU
zhuW-x?J(N*{*1W&ON6t8aJEtu3qS}NLXg?nifF^3r%j*Buh(K7Tx_K%7O;1a&V%0~
z#5f?tcI#e529fN$e>}8lV=G0m00eIBMF<l~>KQg(Ornlqh1i5p?&~0AE5#rJkbnQn
zv=ZrbMko_jhok>}N3atql+L|W+e*KC2$(%oCZ*JC_xB_wh1K0-cqWnn2|VeO!bw?*
zK?Imh#IgWH&2onA6H)ey=`xrFv6W&F0Z5r)w^W2&_LOd{RzY2xenj5>m1P(d3qZ(0
zB|(*F5u<G4;NSYm4n<7;RQ_EoK=`0xS7{5d=bw97Yf9kbtFkRsxH%hyRNcDxcV__x
zGu!Q<kTm0FR^99ZK}vf+VMu#doge;ksIdcEZu8s)odlR=GY0vv;@p5jN1P*Xa5IdU
z_y;2NQ|5kF#WNpG5N8ahv@x4)v+A7%AmQ{x3P}zpM0eBanhr9*XRU;p*9HV#*{FYl
zUi-H0=N)!p^vTG+m2Az4@;nQj1mx4xE@I|{Mcd(rcOtHTchX7_JMxI<XSSwLZwW!|
zR#Mq@r|KktLnI93I&8Mpn?R7brcK?u+SEaPT0g{Hx%D@eQvcJ?NdPAtnmOTf_05QU
zIB6>de^=kAPwzhDjoVp(&SvlC&ncGEO;c?99UwQfEduYFbt@|NZ=`%OMjv0j1Z2l@
z;^t2=xk3vmNtxTamfrEMoyW$&XV-U|{T33yfg}@B>ShrU^)9f(Ag`~GX(u#$S1c^R
z0P+F>b%cb1`aHCgby`Btd%xXQB!Dv_tVEaOE=g8nO+&E&P9@&F<Q^hfjWZ2{2*{2l
zVmrBqO4d9^yBt&i=k4T{8|-qWBw6{GhQS3GL|!1g|5t=7!la)5C9iF0EJXm4L|p&A
zz8|TxEd$FDuneX%d_EBZ4rhp43G+Bck$#TEN`6KWcgE=}{W~^RaTN~J<X;=_Y>n=Z
zMzNXjb*#qcFmc^U*xcC~-G2Z80RR6|sl9Rl000I_L_t&o05rBmgYif2-~a#s07*qo
IM6N<$g2m$)#sB~S

diff --git a/static/applocation/xszk.png b/static/applocation/xszk.png
deleted file mode 100644
index 37e7e58a37aef4538bd4651787a6a6fed41eeb1e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1407
zcmV-_1%UdAP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000FvNkl<ZcmeF$
zF>D+~6b9gTS5T#}pa~67m<AfVfyOA7Xo7@9iXb7;*b-%mlqo1F(m|0DacPi{hy;<4
zNQ1D18))JN8d3xrQh|$9G|PTop1gP3+nc>JhC?~!znPt#dGG(<do#P|jHCYSPO29!
zO{#A%eNz2Vqx#QdQhkAQO+CgsRTcN6irt9Vh;{f>aRq1GW#Ge_^Lh}kiMIZ2R1uSL
zt>j8;aJ{-!Y{|fSk)CF|vF-xmiGb;hp8wUEWMJ!J#KjBc<S#rGvGZIES~Ji3N&*o7
z=#2>Y?Cprnr{}qu9ykAk*PC^F+p7s#N`Po10YpsGTYUBS&t?ugds~f=%bU&E(C@(l
zMET>lBHF}{9z|ULI^x0aW$tf&7jf_Bh)0i``GnkfEkZV$k@D|B0xrK8fxH^#0s+K<
z2t=;F6rntn)WLoPeD!V<<!i6TiE!&~9yX#0VGH)QA_&nhMX>;pzp-;_mgD#CMj$R5
z$_eQtsZ8!Ys3ToNW>Q?vQ!**!*7p(Svu>OX{Sp)j;9OMG;O+YnBIuekqzJt8V-wXk
zKaC(xselZ<^LYfgwoar8X8X=h&AJpJi(uX&6bV3*BgT-teH150AmSX!0>Za`Xfk46
z7eriE2oVG}l_c@9^!_)etLz8&Pe;0Y3k682Guv_mkhcer=NJ(YcF&wrutT({r!9eC
zj}1Qf*6+hY0Su)95#lg2!WklYe`qV}#9K#%h_h$hSP2#iP@n1+7#0<<i8(8A(l<xu
z1V*6j3v*oyj&gI|hlK(xW(f4vCa1IHokZ%{k%<UG<|jngL7?n%EL)``AZ$R|*XEpg
zZIOUnEb@qmPTRP#HaYWb?p&uO++OMu;C=?gJlCZdARuDr`Nph>HNEDW01<bdJ3{S~
zt!JBiz6k<R&P*C_LqOP-0k+!r`uc+eFwO~QT}BZ%o~=G{qH0Y>*?1QYe`!YfX?lyl
ziv>u%$Q=DP-zc)?K+Zzm_-xtb{dOxjuKCiIpjbeX63JP^PAB8Ydb*mcT$Byy&num_
zEjC;etSv#YfIeeN#(9pYDB25Jf{;==S6_~BLV3CK9O<&hPS<$f*qI3608#Hp&T!8T
z<V8~HXs^8zC$G<hIibM1He{}SUD7WWfFOe<^{H&Ydy~@1O(`=Ti1X|a>R$TNUxYyd
zq<Hh0ev?RuJ`zf&fA;j<430fDeP{kvu>d9*7R|m?dkPaF(ga(Vt>=in&>quI_`#&l
zkG2GZ1SkncyXx1tvLVnswQdZQk&IXe1lcF<C5X1xv%uUOU(^l~aQJJp5k;{p3nFKZ
z-vw>Q2s@=@#Xj(RV3wq^vu0M9u|5nEz>re~d8OjI4Fa4(?Xm15EE5P4l;c{NgFJ?f
zm13{}Bt+SZSw^kYS=T%p*K>iup_`t)!2&E&3LN??!YU%vydN?$DsybIKLkq&Py%XN
z$q?c7!6qzqjIgL9Z%x|LABv>}a3WfM(<&$AiLft3)%`BGCu8R3X~ahR#OhktH@38Z
zG^&R6k+2a()%%WLXZoP;JxE{1%$GfxAl~(|SV@45jDV9#88{vtlf)n=;$V)9c|Mru
zM~|9Uifk-P-nx|pC?7=f^f)2;_aCW<*_}iH!b-*SfjExMH7C~^TLvo$;E)LIGLQjS
zW^JxnSwI^4x7vS3z&Wb<UkErp$AF!=t8t8?{#$db<!2OecU*tf|Bn*un1$my_}9k=
z`=f`WQEb=vGS=gBTys6Bv3;;VdiWOr00960_D)Oc00006Nkl<Z0|4`cbAz-lnbZIP
N002ovPDHLkV1h_Dn{xmF

diff --git a/static/applocation/yqlb.png b/static/applocation/yqlb.png
deleted file mode 100644
index 839c29593cedaaf9dd2129912255c05dc6b6e75c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 774
zcmV+h1Nr=kP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0008JNkl<ZcmeE~
zFKiS+6vn?@fvUKmiXn(9Fn0<A=_MFYRFs4S)ANW*1QLM*QAs!?2~B{6gc`ynV8FBn
z3?~{?4RE3gv&@gp%kFJ1+|K?vZrk15xASJ^&Aj)`o0*-PQ10muqYLZ9=>7WB=$AvZ
z^cY4j@!7eq5Fv`RuSk7K9W~*Jw1Lm~P6Qq~pPS*hb2RnqMA9&HOg2)5%@QMZi9oZQ
zp7yrWbOLG#Oh<I_xi$ieAM<I8l|*3WjI`C09^a6j+>F!fYl$J`2iK(Mw~{*ABpSt~
z(gaplVyCydQg>BaJFCCxy{ppQ%dx}ASI$f5qC*~{<cqr=w=7M7Q8z~pj-+S%($R6;
z`R2u#3^}X&_?=u#1|o5;_`4JV8&%Bje3G``IsymM?H3XbQx5jNC3W}TIUPrma-so{
zi=q?(rVECTe@nYxkrM2FN#wn8A|s`Btq;nJpcH|$!R(@hl-1jmvV2z8%8R6>2-q~i
zA$Fm>4y1K$P2_Ex)yqYIFtb>*NISxUwQUkTb|5pxVx<hcxg)WyQb&~1b<`VdV?gg;
z$VGq=X0gpex^s-04y3Kl%1G(U%8@CX1=E?A<|2^pgpji+>wrzkw7q$<Hvx8+haaRm
zz&B)`!`XTd0@<d^kw1L|`1-Po)Pe3f|EPLLVDpm1)>j8O5c*Q^Cg5wJZv9*Y*xvd>
z2_WMX2Q>0k!1^S${<6mpY|cV10<#(}OIb_ce@CK?KpTOQBhXHvk^@+}dEp3fZmH@x
z!5^WbObQdgXjKO~`dS!)@sIe<htGc182|LA;T?gU&+#P{msnMU%Q0UH-UNIN)UDqV
zsC$Ix^<Pf}=2@+<{zMR%R5&0D?<!OvccZUHK7sT)bgzN)zKKzoxWV5JM}y!n2-I_U
z<%l%lH*vm>9D1WcaQFuR0RR8!Ue%%i000I_L_t&o0RM-}bn|=LIsgCw07*qoM6N<$
Ef>&a5)Bpeg

diff --git a/static/applocation/zhcz.png b/static/applocation/zhcz.png
deleted file mode 100644
index 2388accb40c625049de0d72d2bf8cf3747ad791b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 935
zcmV;Y16cftP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000AANkl<ZcmeE~
zFKiS+6vn?hfhtLZsv?MDz_bbjX%kFQRFnkSCP+jj0*R;tQAxN;5}H62X9$;Y225+f
zaH612!6j5-miaMxxxL9vxA!Nrw@okiX5PM;-TA)v-u&6E%l%dx*|n8M_HpG^_S;D|
z^U}!Pg4sb=9VN?js7$Mp=2eAXrgbobod`U4n5zNY0nPpAGpSK`OxAP8YN?r)h(NVK
z52Br~Issh}7>sE8tMeU!xl7X8qDqmag|kI78iB<t((4D(lRM?ei+j@JTg4=z1OQG1
zx+l_6H@yIT<Aziei6{Xgz(byXkhb5am(DLnmlo!H9V?>*?1q!Srumwv4D*c572j*}
zG8{Md#6kk$jpQXljzWfZ!c58`ki(WrMkdhx<DoG(yf#>#)pLV)jej*VfxRP%dGY8#
zGO$c?u9+*%&iG))xpQO!4ATDD2hTOaq=N{0N+~2juCpJc7Fz|2oKZ-CWvmRb1!7_X
zyPu_<Pw6GLNQ8t6BS5}0F`FGJWj!?lA>&!QE{s4~fJxit_u|n@C%|Oo7_zw}A-AvU
z|M`a$+G$Iq@M$zkBLMKt<^GW!9eH-QZ=;WGmN62g5C9na3m!)w29Bt_yziqitley-
z5a2Lq8x<Z#3=lQxL(Trf0TDeW$q8_B#k&S*|Equ3FcM5&Y}Ow3H@nrz39MbWp?yu>
z6Acc6fagqw&A0k8yvJL8nVbM%{m{PT07$BkHf)r59Gh?TWq6Ob`Z76zaMD`p01~0y
zY#yS7&GfKNP9Ow;_ZKdEkN`!;mhTr5%C{va(EgDh-hb_2$0hd>)APNs=dbg6lz_3`
zxH+8<TjVwahdV3p(Ci7UOb9wQ`kFw>^stT+u%(QLu@+A%?69N=6V#ra2gAyP<ZbAH
zXL6$tlPCe+eR&sPKvsxJg^1z|K=AA^64)U~Z9?koezB|Jb(8?z_rLi~=HVM@8Uk>h
z3mHBP;2<1>Eibh19ZGyCK+m^@`l$rM&eOieK{&=XF*Y)EY(}<d%u)#$IMS3nN6?GB
zZue2o1Ob4ID;ETYdM=^yTtuLk&|y;_s;-*c=UP?rSCbCvuGn(us~ClzbN+U{wN*Q=
z)wJy7og-3(f6rlUIazLP)sFuG00960m4l1Q00006Nkl<Z0{~;Pjf11NEnxrv002ov
JPDHLkV1kIdw1WTu

diff --git a/static/applocation/zkq.png b/static/applocation/zkq.png
deleted file mode 100644
index 646779b99b975d10a47986232fb336a14851da94..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 918
zcmV;H18Mw;P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0009^Nkl<ZcmeE~
zKWG#|6vn^X!YajKl}apPqs?7q6G^}(f?$dWf=v!AEmEeiv`D8#O7YSNf&mQ(rV$TJ
zqfOFiV~SvvO0P&|v(C?DVE4Rzdw09cWy3A^_Rq|`_rCAFH#55z$sNnx`07$O{<QQm
z{_P|__tK5ug4sb=#7!LQP_dRJHC2Zr)+(66P6nPi%=G~7fTn)USn5WO$!e;xUbnGY
zWT0N4vuK-jC!iUDY(~RB%`y-^=2?%k3}oXG{;4nnbC;x*1!=vdpt5*nv|yM7=I5jr
z_oU5R4tzVTJiRTwzAu5nqGA$Qcc6<5SjNlt;hW%Dc1!}4j-?!;Z{f1-#Ux;>hUsMv
zTAnH+aP~*q{U+@kN=K)b%WC^7A#i#oJ$NH+e{}?oq>T>=nPE^N$M|7=leASrfT)v!
z=Xa7-i^;d+h|rb>#W=`qe@VBNyRU=*5v5jJ^AeMeE8r0i5AcwJ+~b?Rwfxm2u>V5>
zT;eAG>;Z3mc4g$Ed+;+^zX6L@8a!F@?etkf0QQfq5wgDrwhoed#*k%Z?S}sC);Qb!
zE|Cp@qT|7n8QMk#Pv9QyNdyHud17V&B@B@X?(+n|Y&h>9CcCHKK_>-|AAI7QdrJxl
zpj?yz#vl;!5gr6jAArWOh0P)<Bmkh5Yei<V{iK}<%iN%B0L?Os+<ldl1#MZa>=Qom
zoo)U9$s|Bo@G>`wA#WP+%mn}dp2)Lw0(k9uYOc6V&+81kqK7^hhV}b4lK}5R81jRQ
zu4(X_i^*up2I2LX<r6^IWJ60v<ev!~81hFHtU{LJU>`N_Bk#d82CxW#kAEev8Ds-+
z^p_Pg1LGK{WQcAWJo<p=wVW)lEK*LsjsCJy837`imu_mGdgiN+GV;r8S@7srMgU`$
zup*HO$dCbR>^OZU0cv#|W78OG5@6Cz160~4J97GY@ZKcAvdH8cR0{QsZ#G2BpGg1%
z?4D0Px(^lirNvSiN(dgS78oWb;1zj2CK4fqJ!O<RXlB3@IM3G^foW%FmVt|zfq<+o
zL<#i+2CQ;dks5OUp{bTfL)wenspHVsF$;Yc{EevBX`D0~YCC!7h}7ZNcUXH)+PzNW
s<SzgK0RR6Wk3Jdz000I_L_t&o0JkC4bfj;!<p2Nx07*qoM6N<$f&?R{0ssI2

diff --git a/static/bgImg/quik-bg-img.svg b/static/bgImg/quik-bg-img.svg
deleted file mode 100644
index ad992ab..0000000
--- a/static/bgImg/quik-bg-img.svg
+++ /dev/null
@@ -1,20 +0,0 @@
-<svg fill="none" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 670 500" class="design-iconfont">
-  <g clip-path="url(#zbq1vo5r5__clip0_142_2589)">
-    <rect width="670" height="500" rx="32" fill="url(#zbq1vo5r5__paint0_linear_142_2589)"/>
-    <path d="M191 107.157C216.139 131.509 254.181 168.36 289.432 202.507C308.031 220.523 343.338 228.752 368.772 198.151C423.849 131.881 448.302 82.9113 522.711 -68" stroke="url(#zbq1vo5r5__paint1_linear_142_2589)" stroke-opacity=".16" stroke-width="70" stroke-linecap="round"/>
-  </g>
-  <defs>
-    <linearGradient id="zbq1vo5r5__paint0_linear_142_2589" x1="335" y1="0" x2="335" y2="500" gradientUnits="userSpaceOnUse">
-      <stop stop-color="#EBFFF8"/>
-      <stop offset=".512714" stop-color="#FAFFFD"/>
-      <stop offset="1" stop-color="#fff"/>
-    </linearGradient>
-    <linearGradient id="zbq1vo5r5__paint1_linear_142_2589" x1="356.856" y1="-68" x2="356.856" y2="218.589" gradientUnits="userSpaceOnUse">
-      <stop stop-color="#00C087"/>
-      <stop offset="1" stop-color="#00C087" stop-opacity=".5"/>
-    </linearGradient>
-    <clipPath id="zbq1vo5r5__clip0_142_2589">
-      <rect width="670" height="500" rx="32" fill="#fff"/>
-    </clipPath>
-  </defs>
-</svg>
diff --git a/static/coupon/icon_coupon.svg b/static/coupon/icon_coupon.svg
deleted file mode 100644
index b075493..0000000
--- a/static/coupon/icon_coupon.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="32" height="32" viewBox="0 0 32 32"><defs><style>.a{fill:#80bcff;}.b{clip-path:url(#a);}.c{clip-path:url(#b);}.d{fill:#197dff;}.e{fill:#4c99fe;}</style><clipPath id="a"><rect class="a" width="32" height="32" transform="translate(41 962)"/></clipPath><clipPath id="b"><rect class="a" width="32" height="32" transform="translate(338 862)"/></clipPath></defs><g class="b" transform="translate(-41 -962)"><g class="c" transform="translate(-297 100)"><path class="d" d="M27.706,22.243h0V19.407a1.449,1.449,0,0,0-.824-1.483c-1.848-.857-2.472-1.605-2.472-2.965s.577-2.054,2.472-2.966l.038-.023c.341.822,1.073,1.335,2.613,1.832a1.449,1.449,0,0,1,1,1.371l.542,4.415A2.362,2.362,0,0,1,28.89,22.1l-1.183.145Zm0-13.526V6.061a2.36,2.36,0,0,0-2.472-2.224H.521A2.756,2.756,0,0,0,0,3.886a2.6,2.6,0,0,1,1.649-.854L26.18.021A2.775,2.775,0,0,1,26.518,0,2.323,2.323,0,0,1,28.9,1.927l.542,4.416a1.374,1.374,0,0,1-.636,1.572,9.66,9.66,0,0,0-1.1.8Z" transform="translate(338.913 865.612)"/><path class="e" d="M93.989,182.151a1.367,1.367,0,0,0,.824-1.483V176.22A2.358,2.358,0,0,0,92.341,174H67.627a2.357,2.357,0,0,0-2.471,2.224v4.448a1.326,1.326,0,0,0,.824,1.483c1.125.472,2.471,1.425,2.471,2.966a2.936,2.936,0,0,1-2.422,2.962,1.668,1.668,0,0,0-.872,1.486v4.448a2.358,2.358,0,0,0,2.471,2.225H92.341a2.358,2.358,0,0,0,2.471-2.225v-4.448a1.45,1.45,0,0,0-.824-1.483c-1.8-.835-2.471-1.578-2.471-2.965s.629-2.079,2.471-2.966Zm-9.062,2.6a.393.393,0,0,1-.412.371H80.808V186.6h3.707a.393.393,0,0,1,.412.371v.741a.393.393,0,0,1-.412.371H80.808v2.6a.393.393,0,0,1-.412.371h-.824a.393.393,0,0,1-.412-.371v-2.6H75.453a.393.393,0,0,1-.412-.371v-.741a.393.393,0,0,1,.412-.371H79.16v-1.483H75.453a.393.393,0,0,1-.412-.371V184a.393.393,0,0,1,.412-.371h3.119l-3.386-3.274a.361.361,0,0,1,0-.516l.524-.516a.375.375,0,0,1,.524,0l3.745,3.622,3.744-3.62a.378.378,0,0,1,.528,0l.528.52a.364.364,0,0,1,0,.52L81.4,183.634h3.11a.393.393,0,0,1,.412.371v.742Zm0,0" transform="translate(273.002 694.855)"/></g></g></svg>
\ No newline at end of file
diff --git a/static/member_bg.png b/static/member_bg.png
deleted file mode 100644
index 46068f9addc3670edcbaead3d2ada99b06abd014..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 32975
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

diff --git a/static/uni.png b/static/uni.png
deleted file mode 100644
index 8e3a80f4b84ca9dfad7bc1ab724810a1b3be3ba8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4162
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

diff --git a/store/account.js b/store/account.js
index cce171a..c3bf537 100644
--- a/store/account.js
+++ b/store/account.js
@@ -2,6 +2,18 @@
 import { defineStore } from "pinia";
 import * as shopApi from "@/http/api/shop.js";
 
+//判断是否是主店
+export const isMainShop = (shopId) => {
+  const shopInfo=uni.getStorageSync("shopInfo");
+  if(shopInfo.isHeadShop){
+    return true
+  }
+  if(shopInfo.shopType=='only'){
+    return  true
+  }
+  return false
+}
+
 // 分销
 export const useAccountInfoStore = defineStore("accountInfo", {
   state: () => {
diff --git a/store/chat.js b/store/chat.js
new file mode 100644
index 0000000..57a55b7
--- /dev/null
+++ b/store/chat.js
@@ -0,0 +1,17 @@
+import { defineStore } from "pinia";
+// import * as shopApi from "@/http/api/shop.js";
+
+// 聊天
+export const useChatStore = defineStore("chat", {
+  state: () => {
+    return {
+      chatList: [],
+    };
+  },
+  actions: {
+    sendMessage(message) {
+      this.chatList.push(message);
+    },
+  },
+  unistorage: true, // 开启后对 state 的数据读写都将持久化
+});
diff --git a/store/market.js b/store/market.js
index e7b0b0e..aeafa93 100644
--- a/store/market.js
+++ b/store/market.js
@@ -2,6 +2,7 @@
 import { defineStore } from "pinia";
 import * as distributionApi from "@/http/api/market/distribution.js";
 import * as consumeDiscountApi from "@/http/api/market/consumeDiscount.js";
+import * as memberApi from "@/http/api/market/member.js";
 
 export const upgradeTypes = [
   {
@@ -57,7 +58,6 @@ export const useDistributionStore = defineStore("distribution", {
 export const useNewUserDiscountStore = defineStore("newUserDiscount", {
   state: () => {
     return {
-      //分销配置
       config: {
         isEnable: 0,
       },
@@ -70,15 +70,56 @@ export const useNewUserDiscountStore = defineStore("newUserDiscount", {
       return this.config;
     },
     async editConfig(data, isAutoResrefresh = true) {
+      if (data.discountType === "FIXED") {
+        data.randomDiscountList = [];
+      }
       const res = await consumeDiscountApi.editConfig({
         ...this.config,
         ...data,
       });
       if (isAutoResrefresh) {
-        this.getConfig();
+        setTimeout(() => {
+          this.getConfig();
+        }, 1500);
       }
       return res;
     },
   },
   unistorage: true, // 开启后对 state 的数据读写都将持久化
 });
+
+//超级会员
+export const useSuperVipStore = defineStore("superVip", {
+  state: () => {
+    return {
+      config: {
+        isOpen: 0,
+        configList:[]
+      },
+      vipLevelList:[]
+    };
+  },
+  actions: {
+    setVipLevelList(list){
+      this.vipLevelList = list||[];
+    },
+    editPlan(index,plan){
+      this.config.configList[index] = plan;
+    },
+    addPlan(plan){
+      this.config.configList.push(plan);
+    },
+    async getConfig() {
+      const data = await memberApi.getConfig();
+      data.memberPriceShopType = data.memberPriceShopType.toLowerCase();
+      this.config = data;
+      return this.config;
+    },
+    async editConfig(data) {
+      const res = await memberApi.editConfig({ ...this.config,memberPriceShopType:this.config.memberPriceShopType.toUpperCase(), ...data });
+      this.getConfig();
+      return res;
+    },
+  },
+  unistorage: true, // 开启后对 state 的数据读写都将持久化
+});