From ecff9470d3e1fe3b6993e3fdf82f502dee9a4c0f Mon Sep 17 00:00:00 2001
From: fanfan <franceesfan@163.com>
Date: Mon, 15 Apr 2024 17:18:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/cart/index.vue            |    4 +-
 pages/goods/detail - 副本.vue |  339 -----
 pages/goods/detail.vue          |   45 +-
 pages/goods/list.vue            |    6 +-
 pages/index/index.vue           |    6 +-
 pages/index/index1.vue          | 2097 -------------------------------
 pages/order/detail - 副本.vue |  915 --------------
 pages/order/index2.vue          |  523 --------
 static/test/JD.png              |  Bin 960 -> 0 bytes
 static/test/address.png         |  Bin 1166 -> 0 bytes
 static/test/ben.png             |  Bin 1608 -> 0 bytes
 static/test/moments.png         |  Bin 2040 -> 0 bytes
 static/test/redShen.png         |  Bin 1350 -> 0 bytes
 static/test/selectIcon.png      |  Bin 1127 -> 0 bytes
 static/test/sheng.png           |  Bin 958 -> 0 bytes
 static/test/shenhe.png          |  Bin 1279 -> 0 bytes
 static/test/tongkuan.png        |  Bin 1588 -> 0 bytes
 static/test/zhuan.png           |  Bin 1843 -> 0 bytes
 utils/qqmap-wx-jssdk.min.js     |    1 -
 19 files changed, 21 insertions(+), 3915 deletions(-)
 delete mode 100644 pages/goods/detail - 副本.vue
 delete mode 100644 pages/index/index1.vue
 delete mode 100644 pages/order/detail - 副本.vue
 delete mode 100644 pages/order/index2.vue
 delete mode 100644 static/test/JD.png
 delete mode 100644 static/test/address.png
 delete mode 100644 static/test/ben.png
 delete mode 100644 static/test/moments.png
 delete mode 100644 static/test/redShen.png
 delete mode 100644 static/test/selectIcon.png
 delete mode 100644 static/test/sheng.png
 delete mode 100644 static/test/shenhe.png
 delete mode 100644 static/test/tongkuan.png
 delete mode 100644 static/test/zhuan.png
 delete mode 100644 utils/qqmap-wx-jssdk.min.js

diff --git a/pages/cart/index.vue b/pages/cart/index.vue
index 9f7d97b..56dd0d4 100644
--- a/pages/cart/index.vue
+++ b/pages/cart/index.vue
@@ -90,7 +90,7 @@
 								<text v-if="item.line_price_min > 0"
 									class="line-price col-9 f-24">￥{{ item.line_price_min>0?Number(item.line_price_min):0.00  }}</text>
 							</view>
-							<image src="../../static/test/redShen.png" v-if="is_check==1" mode=""></image>
+							<image :src="$picUrl+'/static/detail/redShen.png'" v-if="is_check==1" mode=""></image>
 						</view>
 						<view class="goodsInfo1">
 							<view class="oneTip">
@@ -139,7 +139,7 @@
 								<text v-if="item.line_price_min > 0"
 									class="line-price col-9 f-24">￥{{ item.line_price_min>0?Number(item.line_price_min):0.00  }}</text>
 							</view>
-							<image src="../../static/test/redShen.png" v-if="is_check==1" mode=""></image>
+							<image :src="$picUrl+'/static/detail/redShen.png'" v-if="is_check==1" mode=""></image>
 						</view>
 						<view class="goodsInfo1">
 							<view class="oneTip">
diff --git a/pages/goods/detail - 副本.vue b/pages/goods/detail - 副本.vue
deleted file mode 100644
index ec85d52..0000000
--- a/pages/goods/detail - 副本.vue	
+++ /dev/null
@@ -1,339 +0,0 @@
-<template>
-  <view v-show="!isLoading" class="container" :style="appThemeStyle">
-    <!-- 商品图片轮播 -->
-    <SlideImage v-if="!isLoading" :video="goods.video" :videoCover="goods.videoCover" :images="goods.goods_images" />
-
-    <!-- 商品信息 -->
-    <view v-if="!isLoading" class="goods-info m-top20">
-      <!-- 价格、销量 -->
-      <view class="info-item info-item__top dis-flex flex-x-between flex-y-end">
-        <view class="block-left dis-flex flex-y-center">
-          <!-- 商品售价 -->
-          <text class="floor-price__samll">￥</text>
-          <text class="floor-price">{{ goods.goods_price_min }}</text>
-          <!-- 会员价标签 -->
-          <view v-if="goods.is_user_grade" class="user-grade">
-            <text>会员价</text>
-          </view>
-          <!-- 划线价 -->
-          <text v-if="goods.line_price_min > 0" class="original-price">￥{{ goods.line_price_min }}</text>
-        </view>
-        <view class="block-right dis-flex">
-          <!-- 销量 -->
-          <view class="goods-sales">
-            <text>已售{{ goods.goods_sales }}件</text>
-          </view>
-        </view>
-      </view>
-      <!-- 标题、分享 -->
-      <view class="info-item info-item__name dis-flex flex-y-center">
-        <view class="goods-name flex-box">
-          <text class="twoline-hide">{{ goods.goods_name }}</text>
-        </view>
-        <view class="goods-share__line"></view>
-        <view class="goods-share">
-          <button class="share-btn dis-flex flex-dir-column" @click="onShowShareSheet()">
-            <text class="share__icon iconfont icon-fenxiang"></text>
-            <text class="f-24">分享</text>
-          </button>
-        </view>
-      </view>
-      <!-- 商品卖点 -->
-      <view v-if="goods.selling_point" class="info-item info-item_selling-point">
-        <text>{{ goods.selling_point }}</text>
-      </view>
-    </view>
-
-    <!-- 选择商品规格 -->
-    <view v-if="goods.spec_type == 20" class="goods-choice m-top20 b-f" @click="onShowSkuPopup(1)">
-      <view class="spec-list">
-        <view class="flex-box">
-          <text class="col-8">选择：</text>
-          <text class="spec-name" v-for="(item, index) in goods.specList" :key="index">{{ item.spec_name }}</text>
-        </view>
-        <view class="f-26 col-9 t-r">
-          <text class="iconfont icon-arrow-right"></text>
-        </view>
-      </view>
-    </view>
-
-    <!-- 商品服务 -->
-    <Service v-if="!isLoading" :goods-id="goodsId" />
-
-    <!-- 商品SKU弹窗 -->
-    <SkuPopup v-if="!isLoading" v-model="showSkuPopup" :skuMode="skuMode" :goods="goods" @addCart="onAddCart" />
-
-    <!-- 商品评价 -->
-    <Comment v-if="!isLoading" :goods-id="goodsId" :limit="2" />
-
-    <!-- 商品描述 -->
-    <view v-if="!isLoading" class="goods-content m-top20">
-      <view class="item-title b-f">
-        <text>商品描述</text>
-      </view>
-      <view v-if="goods.content != ''" class="goods-content__detail b-f">
-        <mp-html :content="goods.content" />
-      </view>
-    </view>
-
-    <!-- 商品推荐 -->
-    <recommended />
-
-    <!-- 底部选项卡 -->
-    <view class="footer-fixed">
-      <view class="footer-container">
-        <!-- 导航图标 -->
-        <view class="foo-item-fast">
-          <!-- 首页 -->
-          <view class="fast-item fast-item--home" @click="onTargetHome">
-            <view class="fast-icon">
-              <text class="iconfont icon-shouye"></text>
-            </view>
-            <view class="fast-text">
-              <text>首页</text>
-            </view>
-          </view>
-          <!-- 客服 -->
-          <customer-btn v-if="isShowCustomerBtn">
-            <view class="fast-item">
-              <view class="fast-icon">
-                <text class="iconfont icon-kefu1"></text>
-              </view>
-              <view class="fast-text">
-                <text>客服</text>
-              </view>
-            </view>
-          </customer-btn>
-          <!-- 购物车 -->
-          <view class="fast-item fast-item--cart" @click="onTargetCart">
-            <view v-if="cartTotal > 0" class="fast-badge fast-badge--fixed">{{ cartTotal > 99 ? '99+' : cartTotal }}
-            </view>
-            <view class="fast-icon">
-              <text class="iconfont icon-gouwuche"></text>
-            </view>
-            <view class="fast-text">
-              <text>购物车</text>
-            </view>
-          </view>
-        </view>
-        <!-- 操作按钮 -->
-        <view class="foo-item-btn">
-          <view class="btn-wrapper">
-            <view v-if="isEnableCart" class="btn-item btn-item-deputy" @click="onShowSkuPopup(2)">
-              <text>加入购物车</text>
-            </view>
-            <view class="btn-item btn-item-main" @click="onShowSkuPopup(3)">
-              <text>立即购买</text>
-            </view>
-          </view>
-        </view>
-      </view>
-    </view>
-
-    <!-- 快捷导航 -->
-    <!-- <shortcut bottom="120rpx" /> -->
-
-    <!-- 分享菜单 -->
-    <share-sheet v-model="showShareSheet" :shareTitle="goods.goods_name" :shareImageUrl="goods.goods_image" :posterApiCall="posterApiCall"
-      :posterApiParam="{ goodsId }" />
-
-  </view>
-</template>
-
-<script>
-  import WxofficialMixin from '@/core/mixins/wxofficial'
-  import { getSceneData } from '@/core/app'
-  import * as GoodsApi from '@/api/goods'
-  import * as CartApi from '@/api/cart'
-  import SettingModel from '@/common/model/Setting'
-  import { GoodsTypeEnum } from '@/common/enum/goods'
-  import Recommended from '@/components/recommended'
-  import ShareSheet from '@/components/share-sheet'
-  import CustomerBtn from '@/components/customer-btn'
-  import SlideImage from './components/SlideImage'
-  import SkuPopup from './components/SkuPopup'
-  import Comment from './components/Comment'
-  import Service from './components/Service'
-
-  export default {
-    components: {
-      Recommended,
-      ShareSheet,
-      CustomerBtn,
-      SlideImage,
-      SkuPopup,
-      Comment,
-      Service
-    },
-    mixins: [WxofficialMixin],
-    data() {
-      return {
-        // 正在加载
-        isLoading: true,
-        // 当前商品ID
-        goodsId: null,
-        // 商品详情
-        goods: {},
-        // 购物车总数量
-        cartTotal: 0,
-        // 显示/隐藏SKU弹窗
-        showSkuPopup: false,
-        // 模式 1:都显示 2:只显示购物车 3:只显示立即购买
-        skuMode: 1,
-        // 显示/隐藏分享菜单
-        showShareSheet: false,
-        // 获取商品海报图api方法
-        posterApiCall: GoodsApi.poster,
-        // 是否支持加入购物车
-        isEnableCart: false,
-        // 是否显示在线客服按钮
-        isShowCustomerBtn: false,
-      }
-    },
-
-    /**
-     * 生命周期函数--监听页面加载
-     */
-    async onLoad(options) {
-      // 记录query参数
-      this.onRecordQuery(options)
-      // 加载页面数据
-      this.onRefreshPage()
-      // 是否显示在线客服按钮
-      this.isShowCustomerBtn = await SettingModel.isShowCustomerBtn()
-    },
-
-    methods: {
-
-      // 记录query参数
-      onRecordQuery(query) {
-        const scene = getSceneData(query)
-        this.goodsId = query.goodsId ? parseInt(query.goodsId) : parseInt(scene.gid)
-      },
-
-      // 刷新页面数据
-      onRefreshPage() {
-        const app = this
-        app.isLoading = true
-        Promise.all([app.getGoodsDetail(), app.getCartTotal()])
-          .then(() => app.setWxofficialShareData())
-          .finally(() => app.isLoading = false)
-      },
-
-      // 获取商品信息
-      getGoodsDetail() {
-        const app = this
-        return new Promise((resolve, reject) => {
-          GoodsApi.detail(app.goodsId)
-            .then(result => {
-              app.goods = result.data.detail
-              if (app.goods.goods_type == GoodsTypeEnum.PHYSICAL.value) {
-                app.isEnableCart = true
-              }
-              resolve(result)
-            })
-            .catch(reject)
-        })
-      },
-
-      // 获取购物车总数量
-      getCartTotal() {
-        const app = this
-        return new Promise((resolve, reject) => {
-          CartApi.total()
-            .then(result => {
-              app.cartTotal = result.data.cartTotal
-              resolve(result)
-            })
-            .catch(reject)
-        })
-      },
-
-      // 更新购物车数量
-      onAddCart(total) {
-        this.cartTotal = total
-      },
-
-      /**
-       * 显示/隐藏SKU弹窗
-       * @param {skuMode} 模式 1:都显示 2:只显示购物车 3:只显示立即购买
-       */
-      onShowSkuPopup(skuMode = 1) {
-        const app = this
-        if (app.isEnableCart) {
-          app.skuMode = skuMode
-        } else {
-          app.skuMode = 3
-        }
-        app.showSkuPopup = !app.showSkuPopup
-      },
-
-      // 显示隐藏分享菜单
-      onShowShareSheet() {
-        this.showShareSheet = !this.showShareSheet
-      },
-
-      // 跳转到首页
-      onTargetHome(e) {
-        this.$navTo('pages/index/index')
-      },
-
-      // 跳转到购物车页
-      onTargetCart() {
-        this.$navTo('pages/cart/index')
-      },
-
-      // 设置微信公众号链接分享卡片内容
-      setWxofficialShareData() {
-        const { goods } = this
-        this.updateShareCardData({
-          title: goods.goods_name,
-          desc: goods.selling_point,
-          imgUrl: goods.goods_image
-        })
-      },
-
-    },
-
-    /**
-     * 分享当前页面
-     */
-    onShareAppMessage() {
-      const app = this
-      // 构建页面参数
-      const params = app.$getShareUrlParams({
-        goodsId: app.goodsId,
-      })
-      return {
-        title: app.goods.goods_name,
-        path: `/pages/goods/detail?${params}`
-      }
-    },
-
-    /**
-     * 分享到朋友圈
-     * 本接口为 Beta 版本，暂只在 Android 平台支持，详见分享到朋友圈 (Beta)
-     * https://developers.weixin.qq.com/miniprogram/dev/framework/open-ability/share-timeline.html
-     */
-    onShareTimeline() {
-      const app = this
-      // 构建页面参数
-      const params = app.$getShareUrlParams({
-        goodsId: app.goodsId,
-      })
-      return {
-        title: app.goods.goods_name,
-        path: `/pages/goods/detail?${params}`
-      }
-    }
-  }
-</script>
-
-<style>
-  page {
-    background: #fafafa;
-  }
-</style>
-<style lang="scss" scoped>
-  @import "./detail.scss";
-</style>
\ No newline at end of file
diff --git a/pages/goods/detail.vue b/pages/goods/detail.vue
index c1c0f85..c235197 100644
--- a/pages/goods/detail.vue
+++ b/pages/goods/detail.vue
@@ -35,14 +35,14 @@
 				</view>
 				<view class="right">
 					<view class="rightPrice" v-if="goods.is_check==1">
-						<image src="../../static/test/shenhe.png" style="width: 44rpx;height: 42rpx;"></image>
+						<image :src="$picUrl+'/static/detail/shenhe.png'" style="width: 44rpx;height: 42rpx;"></image>
 					</view>
 					<view class="rightBox">
-						<image src="../../static/test/ben.png" v-if="userInfo.user_type==40"
+						<image :src="$picUrl+'/static/detail/ben.png'" v-if="userInfo.user_type==40"
 							style="width: 44rpx;height: 42rpx;"></image>
-						<image src="../../static/test/zhuan.png" v-if="userInfo.user_type==30"
+						<image  :src="$picUrl+'/static/detail/zhuan.png'" v-if="userInfo.user_type==30"
 							style="width: 44rpx;height: 38rpx;"></image>
-						<image src="../../static/test/sheng.png" v-if="userInfo.user_type==20"></image>
+						<image :src="$picUrl+'/static/detail/sheng.png'" v-if="userInfo.user_type==20"></image>
 						<text class="span"
 							v-if="userInfo.user_type==40">￥{{goods.cost_price_min?Number(goods.cost_price_min):0}}</text>
 						<text class="span"
@@ -70,7 +70,7 @@
 						{{goods.goods_name}}
 					</view>
 					<view class="goodsCircle" @click="shareImg()">
-						<image src="../../static/test/moments.png" mode="" class="goodsCircleImg"></image>
+						<image :src="$picUrl+'/static/detail/moments.png'" mode="" class="goodsCircleImg"></image>
 						<view class="goodsCircleText">
 							分享
 						</view>
@@ -86,7 +86,6 @@
 						<image :src="$picUrl+'/static/detail/tip.png'" v-if="goods_sku_no" @click="toJDdetal()"
 							class="tips">
 						</image>
-						<!-- <image :src="$picUrl+'/static/detail/ys.png'" class="tips"></image> -->
 					</view>
 				</view>
 				<view class="rank" @click="goRanking()" v-if="goods && goods.category">
@@ -99,7 +98,7 @@
 					<view class="goodsNum">
 						<picker mode="multiSelector" @change="multiChange" @columnchange="columnChange"
 							value="{{multiIndex}}" :range="multiArray" range-key="name">
-							<image src="../../static/test/address.png"
+							<image :src="$picUrl+'/static/detail/address.png'"
 								style="width: 46rpx;height: 46rpx;margin-right: 7rpx;">
 							</image>
 							<text style="margin-right: 10rpx;">{{addressResult.city}}：{{stockValue}}</text>
@@ -146,24 +145,6 @@
 					</view>
 				</view>
 			</view>
-			<!-- 			<view class="chosed">
-				<view class="serve">
-					<view class="serveInfo">
-						商家
-					</view>
-				</view>
-				<view class="box" @click="toFuwu()">
-					<view class="business">
-						<view class="busSour">
-							<text>商家来源：平台认证商户</text>
-						</view>
-						<view class="busSour">
-							<text>商家名称：{{cityInfo.shop_name}}</text>
-						</view>
-					</view>
-					<u-icon name="arrow-right" style="float: right;" color="#B7B7B7"></u-icon>
-				</view>
-			</view> -->
 			<view class="chosed">
 				<view class="title">发货</view>
 				<view class="info">预计
@@ -184,7 +165,7 @@
 				<view class="title">保障</view>
 				<view class="info">
 					<view class="infoBao" v-for="(item,index) in serveList" :key="index">
-						<image src="../../static/test/selectIcon.png" class="buy"></image>
+						<image  :src="$picUrl+'/static/detail/selectIcon.png'" class="buy"></image>
 						<text class="info" style="margin-right: 3rpx;">{{item.name}}</text>
 					</view>
 
@@ -245,7 +226,7 @@
 				</view>
 				<view class="footerCus firstBtn" @click="toJDdetal()">
 					<view class="cusIcon">
-						<image src="/static/test/tongkuan.png" style="width: 50rpx;height: 34rpx;"></image>
+						<image :src="$picUrl+'/static/detail/tongkuan.png'" style="width: 50rpx;height: 34rpx;"></image>
 					</view>
 					<view class="customer">
 						看同款
@@ -1035,10 +1016,10 @@
 			toHaibao(index) {
 				this.shareCancel();
 				if (index == 2) {
-					let str = `${this.goods.goods_name}\n
-						前台价：￥${this.goods.goods_price_max}元\n
-						推广价：￥${this.goods.goods_price_min}元\n
-						SKU：${this.goods.goods_no}
+					let str = `${this.goods.goods_name}\n
+						前台价：￥${this.goods.goods_price_max}元\n
+						推广价：￥${this.goods.goods_price_min}元\n
+						SKU：${this.goods.goods_no}
 						`
 					uni.setClipboardData({
 						data: str, //	这里是个坑接受字符串类型 value转化为字符串
@@ -2218,4 +2199,4 @@
 		text-align: center;
 		margin-right: 10rpx;
 	}
-</style>
+</style>
diff --git a/pages/goods/list.vue b/pages/goods/list.vue
index 405f60c..fb32e83 100644
--- a/pages/goods/list.vue
+++ b/pages/goods/list.vue
@@ -127,7 +127,7 @@
 												<text v-if="item.line_price_min > 0"
 													class="line-price col-9 f-24">￥{{ item.line_price_min>0?Number(item.line_price_min):0.00  }}</text>
 											</view>
-											<image src="../../static/test/redShen.png" v-if="is_check==1" mode="">
+											<image :src="$picUrl+'/static/detail/redShen.png'" v-if="is_check==1" mode="">
 											</image>
 										</view>
 										<view class="goodsInfo">
@@ -181,7 +181,7 @@
 												<text v-if="item.line_price_min > 0"
 													class="line-price col-9 f-24">￥{{ item.line_price_min>0?Number(item.line_price_min):''  }}</text>
 											</view>
-											<image src="../../static/test/redShen.png" v-if="is_check==1" mode="">
+											<image :src="$picUrl+'/static/detail/redShen.png'" v-if="is_check==1" mode="">
 											</image>
 										</view>
 										<view class="goodsInfo">
@@ -968,4 +968,4 @@
 		}
 
 	}
-</style>
+</style>
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 70185fa..d60e86e 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -259,7 +259,7 @@
 										<text v-if="item.line_price_min > 0"
 											class="line-price col-9 f-24">￥{{ item.line_price_min>0?Number(item.line_price_min):0.00  }}</text>
 									</view>
-									<image src="../../static/test/redShen.png" v-if="is_check==1" mode=""></image>
+									<image :src="$picUrl+'/static/detail/redShen.png'" v-if="is_check==1" mode=""></image>
 								</view>
 								<view class="goodsInfo1">
 									<view class="oneTip">
@@ -308,7 +308,7 @@
 										<text v-if="item.line_price_min > 0"
 											class="line-price col-9 f-24">￥{{ item.line_price_min>0?Number(item.line_price_min):0.00  }}</text>
 									</view>
-									<image src="../../static/test/redShen.png" v-if="is_check==1" mode=""></image>
+									<image :src="$picUrl+'/static/detail/redShen.png'" v-if="is_check==1" mode=""></image>
 								</view>
 								<view class="goodsInfo1">
 									<view class="oneTip">
@@ -2569,4 +2569,4 @@
 		font-weight: 500;
 		color: #F21A1C;
 	}
-</style>
+</style>
diff --git a/pages/index/index1.vue b/pages/index/index1.vue
deleted file mode 100644
index fcfccd7..0000000
--- a/pages/index/index1.vue
+++ /dev/null
@@ -1,2097 +0,0 @@
-<template>
-	<view class="page">
-		<view class="">
-			<u-navbar :background="background">
-				<view class="group_3">
-					<view class="text-wrapper_1" @click="changeHome('home')"
-						:style="{'backgroundColor':type=='home'?'rgba(255, 255, 255, 1.000000)':none,'color':type=='home'?'red':'#333'}">
-						<text lines="1" class="text_1">首页</text>
-					</view>
-					<view class="text-wrapper_1" @click="changeHome('city')"
-						:style="{'backgroundColor':type=='city'?'rgba(255, 255, 255, 1.000000)':none,'color':type=='city'?'red':'#333'}">
-						<text lines="1" class="text_2">同城送</text>
-					</view>
-
-				</view>
-			</u-navbar>
-		</view>
-		<view class="box_1">
-			<view class="box_3">
-				<view class="group_4">
-					<view class="group_5" @click="search">
-						<view class="image-text_6">
-							<image src="https://www.royaum.com.cn/static/home/search.png" mode="" class="box_4"></image>
-							<text lines="1" decode="true" class="text-group_6">iPhone&nbsp;15</text>
-						</view>
-						<view class="text-wrapper_2">
-							<text lines="1" class="text_3">搜索</text>
-						</view>
-					</view>
-					<view class="group_6">
-						<!-- <view class="text-wrapper_3">
-							<text lines="1" class="text_4">4</text>
-						</view> -->
-					</view>
-				</view>
-				<view v-if="!sameCity">
-					<view class="group_7">
-						<view lines="1" class="text_5">
-							<view class="typeName" @click="changeGoodsType({'category_id':0,children:[]})">
-								推荐
-							</view>
-							<view class="group_9" v-if="chosedType==0"></view>
-						</view>
-						<view lines="1" class="text_5" v-for="(item,index) in goodsType" :key="index">
-							<view class="typeName" @click="changeGoodsType(item)">
-								{{item.name}}
-							</view>
-							<view class="group_9" v-if="chosedType==item.category_id"></view>
-						</view>
-					</view>
-
-					<view class="suggest">
-						<swiper class="swiper" circular :indicator-dots="indicatorDots" :autoplay="autoplay"
-							:interval="interval" :duration="duration">
-							<swiper-item>
-								<view class="swiper-item uni-bg-red">
-									<image :src="$picUrl+'/static/home/suprise.png'" mode="" class="supImg"></image>
-								</view>
-							</swiper-item>
-						</swiper>
-					</view>
-					<view class="group_10">
-						<view class="list_1">
-							<view class="image-text_8-0" @click="goPage('/pages/activity/presale')">
-								<image :src="$picUrl+'/static/home/ys.png'" class="label_2-0"></image>
-								<text lines="1" class="text-group_8-0">预售专区</text>
-							</view>
-							<view class="image-text_8-0" @click="goPage('/pages/invite/index',1)">
-								<image :src="$picUrl+'/static/home/yq.png'"  class="label_2-0"></image>
-								<text lines="1" class="text-group_8-0">邀请有礼</text>
-							</view>
-							<view class="image-text_8-0" @click="goPage('/pages/news/coupon/index',1)">
-								<image :src="$picUrl+'/static/home/lq.png'"  class="label_2-0"></image>
-								<text lines="1" class="text-group_8-0">领券中心</text>
-							</view>
-							<view class="image-text_8-0" @click="goPage('/pages/serve/index',3)">
-								<image :src="$picUrl+'/static/home/az.png'"  class="label_2-0"></image>
-								<text lines="1" class="text-group_8-0">安装报修</text>
-							</view>
-							<view class="image-text_8-0" @click="goPage('/pages/news/recycling/index',1)">
-								<image :src="$picUrl+'/static/home/sm.png'" class="label_2-0"></image>
-								<text lines="1" class="text-group_8-0">上门回收</text>
-							</view>
-							<view class="image-text_8-0" v-for="(item,index) in secondType">
-								<image :src="item.image.external_url" class="label_2-0"></image>
-								<text lines="1" class="text-group_8-0">{{item.name}}</text>
-							</view>
-						</view>
-					</view>
-					<view class="newUser" @click="goNewUser">
-						<view class="firLine">
-							<view class="lineTitle">
-								新人首单礼
-							</view>
-							<view class="more">
-								查看更多
-							</view>
-						</view>
-						<view class="secLine">
-							<view class="linePrice">
-								￥2698
-							</view>
-							<view class="newsInfo">
-								<view class="newsCoupon">
-									新人券包
-								</view>
-								<view class="newTime">
-									领取后7天内有效
-								</view>
-							</view>
-							<view class="newLine">
-
-							</view>
-							<view class="newAccept">
-								去领取
-							</view>
-						</view>
-					</view>
-					<view class="big" @click="goBigGoods" v-if="bigGoodsList.length>0">
-						<view class="bigheader">
-							<view class="headLeft">
-								<view class="card">
-									大牌正品
-								</view>
-								<view class="shop">
-									<text class="shopText">店内现货</text>
-								</view>
-							</view>
-
-							<view class="lookMore">
-								查看更多
-								<u-icon name="arrow-right"></u-icon>
-							</view>
-						</view>
-						<view class="sellGoods">
-							<view v-for="(item,index) in bigGoodsList" :key="index" class="goodsItem">
-								<view class="goodsImage">
-									<image :src="item.goods_image" mode=""></image>
-								</view>
-								<view class="goodsPrice">
-									<text class="price">￥{{item.goods_price_min}}</text>
-								</view>
-								<view class="goodsName">
-									{{item.goods_name}}
-								</view>
-							</view>
-						</view>
-					</view>
-					<view class="limitTime" @click="seckill" v-if="seckillList.length>0">
-						<view class="limitHeadr">
-							<view class="headeLeft">
-								<view class="headerTitle">
-									<image :src="$picUrl+'/static/home/limitBuy.png'" mode=""></image>
-								</view>
-							</view>
-							<view class="headeLeft">
-								<view class="residue">
-									本场剩余
-									<count-down style='display: inline-block;' :date="seckillCutDownTime"
-										separator="colon" theme="custom" />
-								</view>
-								<view class="lookMore">
-									查看更多
-									<u-icon name="arrow-right"></u-icon>
-								</view>
-							</view>
-
-						</view>
-						<view class="limitGoods">
-							<view v-for="(item,index) in seckillList" :key="index" class="limitItem">
-								<view class="limitImg">
-									<image :src="item.goods_image" mode=""></image>
-								</view>
-								<view class="price">
-									<view class="limitPrice">
-										￥{{item.seckill_price_min}}
-									</view>
-									<view class="oldPrice">
-										￥{{item.seckill_price_max}}
-									</view>
-								</view>
-
-							</view>
-
-						</view>
-					</view>
-					<view class="newGoods">
-						<view class="newImage" @click="goNews">
-							<image src="https://www.royaum.com.cn/static/home/newImg.png" mode=""></image>
-						</view>
-						<view class="newRight">
-							<view class="newFirt" @click="goNewGoods">
-								<view class="starting">
-									新品首发
-								</view>
-								<view class="firstGoods">
-									<view v-for="(item,index) in newGoodsList" :key="index" class="goodsItem">
-										<image :src="item.goods_image" mode=""></image>
-										<view class="firstPrice">
-											￥{{item.goods_price_min}}
-										</view>
-									</view>
-
-								</view>
-							</view>
-							<view class="newFirt ranking " @click="rankIng">
-								<view class="starting">
-									排行榜
-									<text class="hotSell">热卖好物专场</text>
-								</view>
-								<view class="firstGoods">
-									<view v-for="(item,index) in rankList" :key="index" class="goodsItem">
-										<image :src="item.goods_image" mode=""></image>
-										<view class="firstPrice">
-											￥{{item.goods_price_min}}
-										</view>
-									</view>
-
-								</view>
-							</view>
-						</view>
-					</view>
-					<view class="goodsList">
-						<view class="group_11" v-for="(item,index) in suggestGoodsList" :key="index">
-							<view class="block_2" @click="goDetails(item)">
-								<image :src="item.goods_image" class="image_3"></image>
-								<view class="box_6">
-									<!-- <view class="text-wrapper_4">
-										<text lines="1" class="text_12">自营</text>
-									</view> -->
-									<text lines="1" decode="true" class="text_13">{{item.goods_name}}</text>
-								</view>
-								<view class="text-wrapper_5">
-									<text lines="1" class="text_14">¥</text>
-									<text lines="1" class="text_15">{{item.goods_price_min}}</text>
-									<text lines="1" class="text_16">到手价</text>
-									<text lines="1" class="text_17">¥{{item.line_price_min}}</text>
-								</view>
-								<!-- <text lines="1" decode="true" class="text_18">200+条评论&nbsp;99%好评率</text> -->
-							</view>
-
-						</view>
-					</view>
-				</view>
-				<view class="sameCity" v-if="sameCity">
-					<view class="shopBg" >
-
-					</view>
-					<view class="shopInfo">
-						<view class="shopName">
-							<view class="name">
-								{{cityInfo.shop_name}}
-							</view>
-							<view class="status">
-								营业中
-							</view>
-						</view>
-						<view class="star">
-							<image :src="$picUrl+'/static/home/star.png'" mode="" class="starImg" v-for="(item,index) in cityInfo.star"
-								:key="index"></image>
-							<text>5.0</text>
-						</view>
-						<view class="openTime">
-							营业时间：{{cityInfo.shop_hours}}
-						</view>
-						<view class="tip">
-							<view class="tipleft">
-								<view class="tipItem" v-for="(item,index) in cityInfo.remark" :key="index">
-									{{item}}
-								</view>
-							</view>
-						
-							
-							<view class="tipRight">
-								<view class="ask">
-									<image src="/static/user/weChat.png" mode="" class="weChat"></image>
-									<view class="askText">
-										咨询
-									</view>
-								</view>
-								<view class="al">
-								
-								</view>
-								<view class="ask">
-									<image :src="$picUrl+'/static/home/ph.png'"  mode="" class="weChat"></image>
-									<view class="askText">
-										电话
-									</view>
-								</view>
-							</view>
-							
-						</view>
-						<view class="hline">
-
-						</view>
-						<view class="shopAddress">
-							<view class="address">
-								<view class="ad">
-									{{cityInfo.address}}
-									<u-icon name="arrow-right"></u-icon>
-								</view>
-								<view class="adInfo">
-									<u-icon name="map-fill"></u-icon>
-									{{cityInfo.summary}}
-								</view>
-							</view>
-							<view class="pCar" @click="toPark">
-								<image :src="$picUrl+'/static/home/p.png'"  mode="" class="p"></image>
-								<view class="car">
-									附近停车场
-								</view>
-							</view>
-						</view>
-					</view>
-					<view class="shopGoods">
-						<view class="fli">
-							<view class="xh">
-								店内现货
-							</view>
-							<view class="lookMore">
-								查看更多
-								<u-icon name="arrow-right"></u-icon>
-							</view>
-						</view>
-						<view class="shopGoodsList">
-							<view class="listItem" v-for="(item,index) in 5" :key="index">
-								<image :src="$picUrl+'/static/newGoods/goods.png'"  mode="" class="itemGoodsImg"></image>
-								<view class="itemGoodsName">
-									iPhone13
-								</view>
-							</view>
-						</view>
-					</view>
-					<view class="shopGoods sameCityServe" @click="sameCityServe">
-						<view class="fli">
-							<view class="xh">
-								同城服务
-							</view>
-							<view class="lookMore">
-								查看更多
-								<u-icon name="arrow-right"></u-icon>
-							</view>
-						</view>
-						<view class="pictureList">
-							<view class="picItem" v-for="(item,index) in cityInfo.imageList" :key="index">
-								<image :src="item" alt="" class="pic"></image>
-							</view>
-						</view>
-					</view>
-					<view class="shopGoods shopEvaluate">
-						<view class="fli">
-							<view class="xh">
-								门店评价<text>(30)</text>
-							</view>
-							<view class="lookMore">
-								查看更多
-								<u-icon name="arrow-right"></u-icon>
-							</view>
-						</view>
-						<view class="customerEvalu">
-							<view class="cusInfo">
-								<view class="cusLeft">
-									<image :src="cityInfo.evaluate.image" mode="" class="ch"></image>
-									<text class="cusName">{{cityInfo.evaluate.nickname}}</text>
-								</view>
-								<view class="day">
-									1天前
-								</view>
-							</view>
-							<view class="evaluateInfo">
-								{{cityInfo.evaluate.content}}
-							</view>
-						</view>
-						<view class="evaLine">
-
-						</view>
-						<view class="fli" @click="shopPicture">
-							<view class="xh">
-								门店相册
-							</view>
-							<view class="lookMore">
-
-								<u-icon name="arrow-right"></u-icon>
-							</view>
-						</view>
-						<view class="pictureList">
-							<view class="picItem" v-for="(item,index) in cityInfo.imageList" :key="index">
-								<image :src="item" alt="" class="pic"></image>
-							</view>
-						</view>
-					</view>
-					<view class="shopGoods shopHistory">
-						<view class="fli">
-							<view class="xh">
-								门店历史
-							</view>
-							<view class="lookMore">
-
-								<u-icon name="arrow-right"></u-icon>
-							</view>
-						</view>
-						<view class="steps">
-							<u-time-line-item node-top="2">
-								<template v-slot:node>
-									<u-icon name="pushpin-fill" color="#ddd" :size="24"></u-icon>
-								</template>
-								<template v-slot:content>
-									{{cityInfo.history.contenmt}}
-								</template>
-							</u-time-line-item>
-							<!-- <u-steps :list="numList" mode="dot" direction="column"></u-steps> -->
-						</view>
-					</view>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-<script>
-	import * as GoodsApi from '@/api/home/index.js';
-	import * as limit from '@/api/sharp/home.js';
-	import CountDown from '@/components/countdown';
-	import * as Api from '@/api/goods'
-	export default {
-		components: {
-			CountDown
-		},
-		data() {
-			return {
-				background: {
-					background: 'url(https://www.royaum.com.cn/static/home/top.png) center top no-repeat',
-					backgroundSize: '100% auto',
-				},
-				suggestGoodsList: [],
-				bigGoodsList: [],
-				seckillCutDownTime: '',
-				seckillList: [],
-				newGoodsList: [],
-				rankList: [],
-				type: 'home',
-				active: 1,
-				numList: [{
-					name: '2023年07月01日'
-				}, {
-					name: '2023年07月01日'
-				}, {
-					name: '2023年07月01日'
-				}, {
-					name: '2023年07月01日'
-				}],
-				sameCity: false,
-				secondType: [],
-				chosedType: 0,
-				goodsList: [
-
-				],
-				goodsType: [],
-				cityInfo:{}
-			}
-		},
-		onShow() {
-			// this.getTypeList()
-			// this.getRankingList();
-			// this.getbrandList();
-			// this.getSeckill();
-			// this.getSuggest();
-			// this.getCityInfo()
-		},
-		methods: {
-			// getCityInfo(){
-			// 	const that =this
-			// 	GoodsApi.cityInfo()
-			// 		.then(res => {
-			// 			if (res.status == 200) {
-			// 				that.cityInfo = res.data
-			// 			}
-				
-				
-			// 		})
-			// 		.finally(() => {})
-			// },
-			// getTypeList() {
-			// 	const that = this
-			// 	GoodsApi.typeList()
-			// 		.then(res => {
-			// 			if (res.status == 200) {
-			// 				that.goodsType = res.data.list
-			// 			}
-
-
-			// 		})
-			// 		.finally(() => {})
-			// },
-			// getSuggest() {
-			// 	// 获取推荐商品
-			// 	const that = this
-			// 	Api.recommended()
-			// 		.then(res => {
-			// 			that.suggestGoodsList = res.data.goodsList
-			// 		})
-
-			// },
-			// getSeckill() {
-			// 	// 限时抢购
-			// 	const that = this
-			// 	that.seckillList = []
-			// 	limit.data()
-			// 		.then(result => {
-			// 			let seckillList = [];
-			// 			if(result.data.tabbar && result.data.tabbar.length > 0){
-			// 				that.seckillCutDownTime = result.data.tabbar[0].count_down_time;
-			// 			}
-			// 			if(result.data.goodsList && result.data.goodsList.data.length > 0){
-			// 				seckillList = result.data.goodsList.data;
-			// 				for (var i = 0; i < seckillList.length; i++) {
-			// 					if (seckillList[i].spec_type == 10) {
-			// 						that.seckillList.push(seckillList[i])
-			// 					}
-			// 				}
-			// 			}
-						
-			// 		})
-
-			// },
-			// getbrandList() {
-			// 	// 商品/大牌正品/新品首发列表
-			// 	this.getNewGoods()
-			// 	this.getBigList()
-			// },
-			// getBigList() {
-			// 	const that = this
-			// 	let param = {
-			// 		page: 1,
-			// 		categoryId: 0,
-			// 		is_brand: 1,
-			// 		is_new: 0,
-			// 		order: 1
-			// 	}
-			// 	GoodsApi.brandList(param)
-			// 		.then(res => {
-			// 			let arr = res.data.data;
-			// 			if(arr && arr.length > 0){
-			// 				arr.map(a=>{
-			// 					a.goods_price_min = Number(a.goods_price_min)
-			// 				})
-			// 			}
-			// 			that.bigGoodsList = arr;
-
-			// 		})
-			// 		.finally(() => {})
-			// },
-			// getNewGoods() {
-			// 	const that = this
-			// 	let param = {
-			// 		page: 1,
-			// 		categoryId: 0,
-			// 		is_brand: 0,
-			// 		is_new: 1,
-			// 		order: 1
-			// 	}
-			// 	GoodsApi.brandList(param)
-			// 		.then(res => {
-			// 			that.newGoodsList = res.data.data;
-			// 			if (that.newGoodsList.length == 4) {
-			// 				that.newGoodsList.pop()
-			// 			}
-			// 		})
-			// 		.finally(() => {})
-			// },
-			// getRankingList() {
-			// 	// 获取首页排行榜
-			// 	const that = this
-			// 	GoodsApi.chartsGoodsJing()
-			// 		.then(result => {
-			// 			that.rankList = result.data[0].goods_list
-			// 		})
-			// 		.finally(() => {})
-			},
-			// changeGoodsType(item) {
-			// 	// 切换商品类型
-			// 	this.chosedType = item.category_id
-			// 	this.secondType =item.children;
-			// 	console.log(this.secondType)
-			// },
-			// changeHome(val) {
-			// 	this.type = val
-			// 	this.sameCity = val == 'home' ? false : true
-			// },
-			// search() {
-			// 	// 跳转商品搜索
-			// 	uni.navigateTo({
-			// 		url: '/pages/search/index'
-			// 	})
-			// },
-			toPark(){
-				// 停车指引
-				uni.navigateTo({
-					url: '/pages/news/park/index'
-				})
-			},
-			// goDetails(item) {
-			// 	uni.navigateTo({
-			// 		url: '/pages/goods/detail?goodsId=' + item.goods_id
-			// 	})
-			// },
-			// goNews() {
-			// 	// 新年换新
-			// 	uni.navigateTo({
-			// 		url: '/pages/activity/newsshop'
-			// 	})
-			// },
-			// goNewUser() {
-			// 	// 新人首单礼
-			// 	uni.navigateTo({
-			// 		url: '/pages/activity/newPeople'
-			// 	})
-			// },
-			// goNewGoods() {
-			// 	uni.navigateTo({
-			// 		url: '/pages/activity/newGoods'
-			// 	})
-			// },
-			// seckill() {
-			// 	uni.navigateTo({
-			// 		url: '/pages/activity/seckill'
-			// 	})
-			// },
-			// rankIng() {
-			// 	uni.navigateTo({
-			// 		url: '/pages/activity/ranking'
-			// 	})
-			// },
-			// goPage(url,type) {
-			// 	if(type == 1){
-			// 		if(!uni.getStorageSync("AccessToken")){
-			// 			uni.navigateTo({
-			// 				url: "/pages/login/index"
-			// 			})
-			// 			return ;
-			// 		}
-			// 	}else{
-			// 		uni.switchTab({
-			// 			url
-			// 		})
-			// 		return ;
-			// 	}
-			// 	uni.navigateTo({
-			// 		url
-			// 	})
-			// },
-			// goBigGoods() {
-			// 	uni.navigateTo({
-			// 		url: '/pages/user/vip/goods'
-			// 	})
-			// },
-			sameCityServe() {
-				uni.navigateTo({
-					url: '/pages/activity/intimate'
-				})
-			},
-			shopPicture() {
-				uni.navigateTo({
-					url: '/pages/news/consult/store'
-				})
-			},
-		}
-	}
-</script>
-<style lang="scss" scoped>
-	.page {
-		background-color: rgba(255, 255, 255, 1.000000);
-		position: relative;
-		width: 750rpx;
-		overflow: hidden;
-		overflow-y: auto;
-		display: flex;
-		flex-direction: column;
-		background-image: url('https://www.royaum.com.cn/static/home/homeback.png');
-		background-size: 100% 100%;
-	}
-
-	.box_1 {
-		position: relative;
-		width: 750rpx;
-		flex-direction: row;
-		display: flex;
-		justify-content: flex-end;
-	}
-
-	.box_2 {
-		background-color: rgba(255, 255, 255, 1.000000);
-		height: 160rpx;
-		width: 750rpx;
-		display: flex;
-		flex-direction: column;
-		margin: 2032rpx 0 0 -6rpx;
-	}
-
-	.section_1 {
-		width: 608rpx;
-		height: 84rpx;
-		flex-direction: row;
-		display: flex;
-		margin: 12rpx 0 0 74rpx;
-	}
-
-	.image-text_1 {
-		width: 48rpx;
-		height: 84rpx;
-		display: flex;
-		flex-direction: column;
-		justify-content: space-between;
-	}
-
-	.image_1 {
-		width: 38rpx;
-		height: 44rpx;
-		margin-left: 6rpx;
-	}
-
-	.text-group_1 {
-		width: 48rpx;
-		height: 34rpx;
-		overflow-wrap: break-word;
-		color: rgba(255, 23, 0, 1.000000);
-		font-size: 24rpx;
-		font-family: PingFang SC-Regular;
-		font-weight: normal;
-		text-align: left;
-		white-space: nowrap;
-		line-height: 24rpx;
-		margin-top: 6rpx;
-	}
-
-	.image-text_2 {
-		width: 48rpx;
-		height: 76rpx;
-		display: flex;
-		flex-direction: column;
-		justify-content: space-between;
-		margin: 8rpx 0 0 86rpx;
-	}
-
-	.label_1 {
-		width: 42rpx;
-		height: 42rpx;
-		margin-left: 4rpx;
-	}
-
-	.text-group_2 {
-		width: 48rpx;
-		height: 34rpx;
-		overflow-wrap: break-word;
-		color: rgba(124, 124, 124, 1.000000);
-		font-size: 24rpx;
-		font-family: PingFang SC-Regular;
-		font-weight: normal;
-		text-align: left;
-		white-space: nowrap;
-		line-height: 24rpx;
-	}
-
-	.image-text_3 {
-		width: 48rpx;
-		height: 74rpx;
-		display: flex;
-		flex-direction: column;
-		justify-content: space-between;
-		margin: 10rpx 0 0 94rpx;
-	}
-
-	.thumbnail_1 {
-		width: 40rpx;
-		height: 36rpx;
-		margin-left: 6rpx;
-	}
-
-	.text-group_3 {
-		width: 48rpx;
-		height: 34rpx;
-		overflow-wrap: break-word;
-		color: rgba(124, 124, 124, 1.000000);
-		font-size: 24rpx;
-		font-family: PingFang SC-Regular;
-		font-weight: normal;
-		text-align: left;
-		white-space: nowrap;
-		line-height: 24rpx;
-		margin-top: 4rpx;
-	}
-
-	.image-text_4 {
-		width: 72rpx;
-		height: 74rpx;
-		display: flex;
-		flex-direction: column;
-		justify-content: space-between;
-		margin: 10rpx 0 0 88rpx;
-	}
-
-	.thumbnail_2 {
-		width: 36rpx;
-		height: 36rpx;
-		margin-left: 12rpx;
-	}
-
-	.text-group_4 {
-		width: 72rpx;
-		height: 34rpx;
-		overflow-wrap: break-word;
-		color: rgba(124, 124, 124, 1.000000);
-		font-size: 24rpx;
-		font-family: PingFang SC-Regular;
-		font-weight: normal;
-		text-align: left;
-		white-space: nowrap;
-		line-height: 24rpx;
-		margin-top: 4rpx;
-	}
-
-	.image-text_5 {
-		width: 48rpx;
-		height: 72rpx;
-		display: flex;
-		flex-direction: column;
-		justify-content: space-between;
-		margin: 12rpx 0 0 76rpx;
-	}
-
-	.thumbnail_3 {
-		width: 32rpx;
-		height: 32rpx;
-		margin-left: 8rpx;
-	}
-
-	.text-group_5 {
-		width: 48rpx;
-		height: 34rpx;
-		overflow-wrap: break-word;
-		color: rgba(124, 124, 124, 1.000000);
-		font-size: 24rpx;
-		font-family: PingFang SC-Regular;
-		font-weight: normal;
-		text-align: left;
-		white-space: nowrap;
-		line-height: 24rpx;
-		margin-top: 6rpx;
-	}
-
-	.section_2 {
-		width: 272rpx;
-		height: 8rpx;
-		display: flex;
-		flex-direction: row;
-		margin: 32rpx 0 24rpx 228rpx;
-	}
-
-	.group_1 {
-		background-color: rgba(0, 0, 0, 1.000000);
-		border-radius: 58rpx;
-		width: 272rpx;
-		height: 8rpx;
-		display: flex;
-		flex-direction: column;
-	}
-
-	.box_3 {
-		position: relative;
-		width: 750rpx;
-		margin-left: -744rpx;
-		display: flex;
-		flex-direction: column;
-	}
-
-	.group_2 {
-		width: 482rpx;
-		height: 56rpx;
-		flex-direction: row;
-		display: flex;
-		justify-content: space-between;
-		margin: 94rpx 0 0 242rpx;
-		align-items: center;
-	}
-
-	.group_3 {
-		background-color: rgba(255, 255, 255, 0.510000);
-		border-radius: 68rpx;
-		width: 212rpx;
-		height: 56rpx;
-		flex-direction: row;
-		display: flex;
-		align-items: center;
-		left: 0;
-		right: 0;
-		margin: auto;
-	}
-
-	.text-wrapper_1 {
-		// background-color: rgba(255, 255, 255, 1.000000);
-		border-radius: 68rpx;
-		height: 48rpx;
-		display: flex;
-		flex-direction: column;
-		width: 94rpx;
-		margin: 4rpx 0 0 4rpx;
-	}
-
-	.text_1 {
-		width: 48rpx;
-		height: 34rpx;
-		overflow-wrap: break-word;
-		// color: rgba(251, 33, 61, 1.000000);
-		font-size: 24rpx;
-		font-family: PingFang SC-Regular;
-		font-weight: normal;
-		text-align: left;
-		white-space: nowrap;
-		line-height: 24rpx;
-		margin: 8rpx 0 0 22rpx;
-	}
-
-	.text_2 {
-		width: 72rpx;
-		height: 34rpx;
-		overflow-wrap: break-word;
-		// color: rgba(0, 0, 0, 1.000000);
-		font-size: 24rpx;
-		font-family: PingFang SC-Regular;
-		font-weight: normal;
-		text-align: left;
-		white-space: nowrap;
-		line-height: 24rpx;
-		margin: 12rpx 24rpx 0 18rpx;
-	}
-
-	.image_2 {
-		width: 158rpx;
-		height: 56rpx;
-	}
-
-	.group_4 {
-		width: 658rpx;
-		height: 64rpx;
-		flex-direction: row;
-		display: flex;
-		justify-content: space-between;
-		margin: 14rpx 0 0 36rpx;
-		align-items: center;
-	}
-
-	.group_5 {
-		background-color: rgba(255, 255, 255, 1.000000);
-		border-radius: 68rpx;
-		width: 590rpx;
-		height: 64rpx;
-		flex-direction: row;
-		display: flex;
-		align-items: center;
-	}
-
-	.image-text_6 {
-		width: 176rpx;
-		height: 40rpx;
-		flex-direction: row;
-		display: flex;
-		justify-content: space-between;
-		margin: 12rpx 0 0 22rpx;
-	}
-
-	.box_4 {
-		width: 28rpx;
-		height: 28rpx;
-	}
-
-	.text-group_6 {
-		width: 126rpx;
-		height: 40rpx;
-		overflow-wrap: break-word;
-		color: rgba(141, 141, 141, 1.000000);
-		font-size: 28rpx;
-		font-family: PingFang SC-Regular;
-		font-weight: normal;
-		text-align: left;
-		white-space: nowrap;
-		line-height: 28rpx;
-	}
-
-	.text-wrapper_2 {
-		background-color: rgba(243, 32, 42, 1.000000);
-		border-radius: 48rpx;
-		height: 56rpx;
-		line-height: 40rpx;
-		display: flex;
-		text-align: center;
-		width: 126rpx;
-		margin: 4rpx 4rpx 0 262rpx;
-		align-items: center;
-	}
-
-	.text_3 {
-		width: 56rpx;
-		height: 40rpx;
-		overflow-wrap: break-word;
-		color: rgba(255, 255, 255, 1.000000);
-		font-size: 28rpx;
-		font-family: PingFang SC-Regular;
-		font-weight: normal;
-		text-align: center;
-		white-space: nowrap;
-		line-height: 28rpx;
-		margin: 8rpx 0 0 36rpx;
-	}
-
-	.group_6 {
-		background-image: url('https://www.royaum.com.cn/static/home/news.png');
-		background-size: 100% 100%;
-		height: 44rpx;
-		margin-top: 10rpx;
-		display: flex;
-		flex-direction: column;
-		width: 48rpx;
-	}
-
-	.text-wrapper_3 {
-		background: #F3202A;
-		border-radius: 100%;
-		height: 30rpx;
-		display: flex;
-		text-align: center;
-		align-items: center;
-		width: 30rpx;
-		margin: -8rpx 0 0 34rpx;
-	}
-
-	.text_4 {
-		width: 16rpx;
-		height: 34rpx;
-		overflow-wrap: break-word;
-		color: rgba(255, 255, 255, 1.000000);
-		font-size: 24rpx;
-		font-family: PingFang SC-Medium;
-		font-weight: 500;
-		text-align: left;
-		white-space: nowrap;
-		line-height: 34rpx;
-		margin: -4rpx 0 0 8rpx;
-	}
-
-	.group_7 {
-		width: 660rpx;
-		height: 44rpx;
-		flex-direction: row;
-		display: flex;
-		margin: 30rpx 0 0 40rpx;
-	}
-
-	.text_5 {
-		width: 56rpx;
-		height: 40rpx;
-		overflow-wrap: break-word;
-		color: rgba(40, 40, 40, 1.000000);
-		font-size: 28rpx;
-		font-family: PingFang SC-Regular;
-		font-weight: normal;
-		text-align: left;
-		white-space: nowrap;
-		line-height: 28rpx;
-		margin-top: 4rpx;
-		margin-right: 54rpx;
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-	}
-
-	.group_9 {
-		background-color: rgba(251, 48, 51, 1.000000);
-		width: 20rpx;
-		height: 8rpx;
-		margin-top: 4rpx;
-	}
-
-	.group_10 {
-		background-color: rgba(255, 255, 255, 1.000000);
-		border-radius: 8rpx;
-		width: 700rpx;
-		max-height: 354rpx;
-		display: flex;
-		flex-direction: column;
-		margin: 12rpx 0 0 20rpx;
-	}
-
-	.goodsList {
-		display: flex;
-		flex-wrap: wrap;
-		width: 100%;
-		height: 354rpx;
-	}
-
-	.newUser {
-		width: 698rpx;
-		height: 230rpx;
-		background-image: url('https://www.royaum.com.cn/static/home/newUserBg.png');
-		background-size: 100% 100%;
-		margin-left: 20rpx;
-
-		.firLine {
-			display: flex;
-			justify-content: space-between;
-
-			.lineTitle {
-				font-size: 40rpx;
-				font-weight: 400;
-				color: #FFFFFF;
-				line-height: 52rpx;
-				margin-left: 32rpx;
-				margin-top: 42rpx;
-			}
-
-			.more {
-				margin-top: 48rpx;
-				width: 96rpx;
-				height: 34rpx;
-				font-size: 24rpx;
-				font-weight: 400;
-				color: #FFF;
-				line-height: 34rpx;
-				margin-right: 194rpx;
-			}
-		}
-
-		.secLine {
-			display: flex;
-			align-items: center;
-
-			.linePrice {
-				margin-left: 66rpx;
-				font-size: 52rpx;
-				font-weight: 600;
-				line-height: 72rpx;
-				background: linear-gradient(180deg, #FF0777 0%, #FF4038 100%);
-				-webkit-background-clip: text;
-				-webkit-text-fill-color: transparent;
-				margin-right: 24rpx;
-				margin-top: 22rpx;
-			}
-
-			.newsInfo {
-				margin-right: 48rpx;
-				margin-top: 22rpx;
-
-				.newsCoupon {
-					height: 50rpx;
-					font-size: 36rpx;
-					font-weight: 600;
-					color: #FF0777; // #FF0777;
-					line-height: 42rpx;
-
-				}
-
-				.newTime {
-					height: 28rpx;
-					font-size: 20rpx;
-					font-weight: 400;
-					color: #FF0777;
-					line-height: 23rpx;
-
-				}
-			}
-
-			.newLine {
-				width: 0rpx;
-				height: 76rpx;
-				opacity: 1;
-				border: 2rpx solid #B9B9B9;
-				margin-top: 22rpx;
-				margin-right: 22rpx;
-			}
-
-			.newAccept {
-				width: 134rpx;
-				height: 54rpx;
-				background: linear-gradient(180deg, #FF1C75 0%, #FF470D 100%);
-				border-radius: 56rpx 56rpx 56rpx 56rpx;
-				opacity: 1;
-				text-align: center;
-				line-height: 54rpx;
-				margin-top: 22rpx;
-				font-size: 24rpx;
-				font-weight: 400;
-				color: #FFFFFF;
-			}
-		}
-	}
-
-	.big {
-		width: 696rpx;
-		max-height: 408rpx;
-		background-image: url('https://www.royaum.com.cn/static/home/bigBack.png');
-		background-size: 100% 100%;
-		margin-top: 16rpx;
-		margin-left: 20rpx;
-		padding-left: 20rpx;
-		padding-top: 16rpx;
-		padding-bottom: 16rpx;
-		.bigheader {
-			display: flex;
-			align-items: center;
-			justify-content: space-between;
-
-			.headLeft {
-				display: flex;
-				align-items: center;
-			}
-
-			.card {
-				width: 146rpx;
-				height: 58rpx;
-				font-size: 30rpx;
-				font-family: YouSheBiaoTiHei, YouSheBiaoTiHei;
-				font-weight: 600;
-				color: #303030;
-				line-height: 58rpx;
-			}
-
-			.shop {
-				width: 148rpx;
-				height: 42rpx;
-				font-size: 24rpx;
-				font-weight: 500;
-				color: #8C4D00;
-				line-height: 42rpx;
-				background-image: url('https://www.royaum.com.cn/static/home/shopBack.png');
-				margin-left: 12rpx;
-
-				.shopText {
-					width: 96rpx;
-					text-align: center;
-					margin-left: 18rpx;
-				}
-			}
-
-			.lookMore {
-				height: 28rpx;
-				font-size: 20rpx;
-				font-weight: 400;
-				color: #8C4D00;
-				line-height: 28rpx;
-				margin-right: 28rpx;
-			}
-		}
-
-		.sellGoods {
-			display: flex;
-			flex-wrap: wrap;
-
-			.goodsItem {
-				width: 134rpx;
-				display: flex;
-				flex-direction: column;
-				text-align: center;
-				align-items: center;
-
-				.goodsImage {
-					width: 108rpx;
-					height: 108rpx;
-
-					image {
-						width: 100%;
-						height: 100%;
-					}
-				}
-
-				.goodsPrice {
-					width: 134rpx;
-					height: 34rpx;
-					position: relative;
-					top: -6rpx;
-					background-image: url('https://www.royaum.com.cn/static/home/priceBack.png');
-					background-size: 100% 100;
-					text-align: center;
-
-					.price {
-						height: 28rpx;
-						font-size: 20rpx;
-						font-family: PingFang SC, PingFang SC;
-						font-weight: 400;
-						color: #FFFFFF;
-						line-height: 28rpx;
-						display: block;
-						width: 90rpx;
-						margin: 0 auto;
-						text-align: left;
-						margin-top: 5rpx;
-					}
-				}
-
-				.goodsName {
-					width: 100rpx;
-					height: 28rpx;
-					font-size: 20rpx;
-					font-family: PingFang SC, PingFang SC;
-					font-weight: 400;
-					color: #505050;
-					line-height: 28rpx;
-					text-align: center;
-					white-space: nowrap;
-					/* 不换行 */
-					overflow: hidden;
-					/* 超出部分隐藏 */
-					text-overflow: ellipsis;
-					/* 溢出部分显示省略号 */
-				}
-			}
-
-		}
-	}
-
-	.limitTime {
-		width: 694rpx;
-		height: 234rpx;
-		background: linear-gradient(180deg, #FFF8F8 0%, #FFFFFF 100%);
-		border-radius: 8rpx 8rpx 8rpx 8rpx;
-		opacity: 1;
-		margin-left: 20rpx;
-		margin-top: 14rpx;
-		padding-top: 16rpx;
-		.limitHeadr {
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-
-			.headeLeft {
-				display: flex;
-				align-items: center;
-			}
-
-			.headerTitle {
-				width: 159rpx;
-				height: 60rpx;
-				border-radius: 0rpx 0rpx 0rpx 0rpx;
-				opacity: 1;
-
-				image {
-					width: 100%;
-					height: 100%;
-				}
-			}
-
-			.residue {
-				display: flex;
-				align-items: center;
-				margin-right: 24rpx;
-
-				.com {
-					width: 31rpx;
-					height: 27rpx;
-					background: #FF4D4D;
-					border-radius: 2rpx 2rpx 2rpx 2rpx;
-					font-size: 19rpx;
-					font-family: PingFang SC, PingFang SC;
-					font-weight: 500;
-					color: #FFFFFF;
-					line-height: 27rpx;
-					text-align: center;
-				}
-			}
-
-			.lookMore {
-				height: 28rpx;
-				font-size: 20rpx;
-				font-family: PingFang SC, PingFang SC;
-				font-weight: 400;
-				color: #8C4D00;
-				line-height: 28rpx;
-				margin-right: 28rpx;
-			}
-		}
-
-		.limitGoods {
-			display: flex;
-			align-items: center;
-			margin-left: 24rpx;
-
-			.limitItem {
-				width: 116rpx;
-				align-items: center;
-				display: flex;
-				flex-direction: column;
-				text-align: center;
-				align-items: center;
-				margin-right: 14rpx;
-
-				.limitImg {
-					width: 100%;
-					height: 106rpx;
-
-					image {
-						width: 100%;
-						height: 100%;
-					}
-				}
-
-				.price {
-					width: 116rpx;
-					position: relative;
-					top: -32rpx;
-					display: flex;
-					flex-direction: column;
-					text-align: center;
-					align-items: center;
-
-					.limitPrice {
-						width: 82rpx;
-						height: 32rpx;
-						font-size: 20rpx;
-						font-family: PingFang SC, PingFang SC;
-						font-weight: 500;
-						color: #FFFFFF;
-						line-height: 32rpx;
-						text-align: center;
-						background-image: url('https://www.royaum.com.cn/static/home/tip.png');
-					}
-
-					.oldPrice {
-						width: 116rpx;
-						height: 28rpx;
-						font-size: 20rpx;
-						font-family: PingFang SC, PingFang SC;
-						font-weight: 400;
-						color: #8E8E8E;
-						line-height: 28rpx;
-						text-decoration: line-through;
-					}
-				}
-
-			}
-		}
-	}
-
-	.newGoods {
-		width: 694rpx;
-		margin-left: 20rpx;
-		display: flex;
-		justify-content: space-between;
-
-		.newImage {
-			width: 300rpx;
-			height: 436rpx;
-			background: #FFFFFF;
-			border-radius: 8rpx 8rpx 8rpx 8rpx;
-			opacity: 1;
-			margin-top: 14rpx;
-
-			image {
-				width: 100%;
-				height: 100%;
-			}
-		}
-
-		.newRight {
-			margin-top: 14rpx;
-			margin-left: 14rpx;
-			width: 390rpx;
-			display: flex;
-			flex-direction: column;
-			align-items: center;
-			text-align: center;
-
-			.newFirt {
-				width: 390rpx;
-				height: 208rpx;
-				background-image: url('https://www.royaum.com.cn/static/home/newFirst.png');
-				background-size: 100% 100%;
-
-				.starting {
-					text-align: left;
-					width: 300rpx;
-					height: 58rpx;
-					font-size: 40rpx;
-					font-family: YouSheBiaoTiHei, YouSheBiaoTiHei;
-					font-weight: 400;
-					color: #333333;
-					line-height: 58rpx;
-					margin: 14rpx 0 0 26rpx;
-
-					.hotSell {
-						;
-						height: 28rpx;
-						font-size: 20rpx;
-						font-family: PingFang SC, PingFang SC;
-						font-weight: 400;
-						color: #454545;
-						line-height: 28rpx;
-					}
-				}
-
-				.firstGoods {
-					display: flex;
-					overflow-x: hidden;
-
-					.goodsItem {
-						position: relative;
-						width: 112rpx;
-						height: 140rpx;
-						margin-left: 26rpx;
-
-						image {
-							width: 100%;
-							height: 130rpx;
-						}
-
-						.firstPrice {
-							width: 112rpx;
-							height: 34rpx;
-							position: absolute;
-							background-image: url('https://www.royaum.com.cn/static/home/priceBack.png');
-							background-size: 100% 100%;
-							top: 100rpx;
-							font-size: 20rpx;
-							font-family: PingFang SC, PingFang SC;
-							font-weight: 400;
-							color: #FFFFFF;
-							line-height: 34rpx;
-						}
-					}
-
-				}
-			}
-
-			.ranking {
-				margin-top: 16rpx;
-				width: 390rpx;
-				height: 208rpx;
-				// background-image: url('https://www.royaum.com.cn/static/home/ranking.png');
-				background-size: 100% 100%;
-			}
-		}
-	}
-
-	.list_1 {
-		width: 100%;
-		min-height: 122rpx;
-		flex-direction: row;
-		flex-wrap: wrap;
-		display: flex;
-		margin: 26rpx 0 0 28rpx;
-	}
-
-	.image-text_8-0 {
-		width: 84rpx;
-		height: 114rpx;
-		margin-right: 54rpx;
-		display: flex;
-		flex-direction: column;
-		text-align: center;
-		align-items: center;
-		justify-content: space-between;
-		margin-bottom: 38rpx;
-	}
-
-	.label_2-0 {
-		width: 84rpx;
-		height: 84rpx;
-	}
-
-	.text-group_8-0 {
-		width: 84rpx;
-		height: 28rpx;
-		overflow-wrap: break-word;
-		color: rgba(0, 0, 0, 1.000000);
-		font-size: 20rpx;
-		font-family: PingFang SC-Regular;
-		font-weight: normal;
-		text-align: center;
-		white-space: nowrap;
-		line-height: 28rpx;
-	}
-
-	.image-text_8-3 {
-		width: 84rpx;
-		height: 122rpx;
-		margin-right: 54rpx;
-		display: flex;
-		flex-direction: column;
-		justify-content: space-between;
-	}
-
-	.group_11 {
-		width: 340rpx;
-		height: 438rpx;
-		flex-direction: row;
-		display: flex;
-		justify-content: space-between;
-		margin: 14rpx 0 0 16rpx;
-	}
-
-	.block_2 {
-		background-color: rgba(255, 255, 255, 1.000000);
-		border-radius: 8rpx;
-		width: 340rpx;
-		height: 436rpx;
-		margin-top: 2rpx;
-		display: flex;
-		flex-direction: column;
-		justify-content: flex-center;
-	}
-
-	.image_3 {
-		width: 276rpx;
-		height: 252rpx;
-		margin: 20rpx 0 0 28rpx;
-	}
-
-	.box_6 {
-		width: 300rpx;
-		height: 34rpx;
-		flex-direction: row;
-		display: flex;
-		justify-content: space-between;
-		margin: 14rpx 0 0 28rpx;
-		white-space: nowrap;
-		overflow: hidden;
-		text-overflow: ellipsis;
-	}
-
-	.text-wrapper_4 {
-		background-color: rgba(255, 68, 56, 1.000000);
-		border-radius: 4rpx;
-		height: 34rpx;
-		display: flex;
-		flex-direction: column;
-		width: 58rpx;
-	}
-
-	.text_12 {
-		width: 48rpx;
-		height: 34rpx;
-		overflow-wrap: break-word;
-		color: rgba(255, 255, 255, 1.000000);
-		font-size: 24rpx;
-		font-family: PingFang SC-Regular;
-		font-weight: normal;
-		text-align: left;
-		white-space: nowrap;
-		line-height: 24rpx;
-		margin-left: 6rpx;
-
-	}
-
-	.text_13 {
-		// width: 236rpx;
-		height: 34rpx;
-		overflow-wrap: break-word;
-		color: rgba(30, 30, 30, 1.000000);
-		font-size: 24rpx;
-		font-family: PingFang SC-Regular;
-		font-weight: normal;
-		text-align: left;
-		white-space: nowrap;
-		line-height: 24rpx;
-		white-space: nowrap;
-		overflow: hidden;
-		text-overflow: ellipsis;
-	}
-
-	.text-wrapper_5 {
-		// width: 242rpx;
-		height: 50rpx;
-		flex-direction: row;
-		display: flex;
-		margin: 20rpx 0 0 34rpx;
-	}
-
-	.text_14 {
-		width: 16rpx;
-		height: 34rpx;
-		overflow-wrap: break-word;
-		color: rgba(242, 26, 28, 1.000000);
-		font-size: 24rpx;
-		font-family: PingFang SC-Semibold;
-		font-weight: 600;
-		text-align: left;
-		white-space: nowrap;
-		line-height: 24rpx;
-		margin-top: 12rpx;
-	}
-
-	.text_15 {
-		min-width: 86rpx;
-		height: 50rpx;
-		overflow-wrap: break-word;
-		color: rgba(242, 26, 28, 1.000000);
-		font-size: 28rpx;
-		font-family: PingFang SC-Semibold;
-		font-weight: 600;
-		text-align: left;
-		white-space: nowrap;
-		line-height: 50rpx;
-	}
-
-	.text_16 {
-		width: 60rpx;
-		height: 28rpx;
-		overflow-wrap: break-word;
-		color: rgba(242, 26, 28, 1.000000);
-		font-size: 20rpx;
-		font-family: PingFang SC-Medium;
-		font-weight: 500;
-		text-align: left;
-		white-space: nowrap;
-		line-height: 20rpx;
-		margin: 14rpx 0 0 6rpx;
-	}
-
-	.text_17 {
-		width: 66rpx;
-		height: 30rpx;
-		overflow-wrap: break-word;
-		color: rgba(148, 148, 148, 1.000000);
-		font-size: 22rpx;
-		font-family: PingFang SC-Regular;
-		font-weight: normal;
-		text-align: left;
-		white-space: nowrap;
-		line-height: 22rpx;
-		margin: 16rpx 0 0 10rpx;
-		text-decoration: line-through;
-	}
-
-	.text_18 {
-		width: 220rpx;
-		height: 28rpx;
-		overflow-wrap: break-word;
-		color: rgba(148, 148, 148, 1.000000);
-		font-size: 20rpx;
-		font-family: PingFang SC-Regular;
-		font-weight: normal;
-		text-align: left;
-		white-space: nowrap;
-		line-height: 20rpx;
-		margin: -2rpx 0 20rpx 36rpx;
-	}
-
-	.suggest {
-		width: 694rpx;
-		height: 196rpx;
-		margin: 8rpx 0 0 20rpx;
-
-		.swiper {
-			width: 694rpx;
-			height: 196rpx;
-
-			.swiper-item {
-				width: 100%;
-				display: block;
-				height: 196rpx;
-				line-height: 196rpx;
-				text-align: center;
-
-				.supImg {
-					width: 694rpx;
-					height: 196rpx;
-				}
-			}
-		}
-	}
-
-	.shopBg {
-		width: 100%;
-		height: 496rpx;
-		background: #FFFFFF;
-		border-radius: 8rpx 8rpx 8rpx 8rpx;
-		opacity: 1;
-	}
-
-	.shopInfo {
-		width: 698rpx;
-		min-height: 400rpx;
-		background: linear-gradient(180deg, rgba(255, 255, 255, 0.86) 0%, #FFFFFF 100%);
-		border-radius: 8rpx 8rpx 8rpx 8rpx;
-		opacity: 1;
-		margin-left: 26rpx;
-		padding: 30rpx 28rpx 0 34rpx;
-		position: relative;
-		top: -240rpx;
-
-		.shopName {
-			width: 100%;
-			display: flex;
-			justify-content: space-between;
-
-			.name {
-				height: 40rpx;
-				font-size: 28rpx;
-				font-family: PingFang SC, PingFang SC;
-				font-weight: 500;
-				color: #000000;
-				line-height: 40rpx;
-			}
-
-			.status {
-				width: 84rpx;
-				height: 40rpx;
-				font-size: 28rpx;
-				font-weight: 400;
-				color: #F3202A;
-				line-height: 40rpx;
-			}
-		}
-
-		.star {
-			margin-top: 10rpx;
-
-			.starImg {
-				width: 24rpx;
-				height: 24rpx;
-			}
-
-			text {
-				height: 36rpx;
-				font-size: 26rpx;
-				font-weight: 500;
-				color: #FA8C3D;
-				line-height: 36rpx;
-			}
-		}
-
-		.openTime {
-			height: 40rpx;
-			font-size: 28rpx;
-			font-weight: 400;
-			color: #818181;
-			line-height: 40rpx;
-			margin-top: 12rpx;
-		}
-
-		.tip {
-			display: flex;
-			justify-content: space-between;
-
-			margin-top: 10rpx;
-			.tipleft{
-				display: flex;
-				.tipItem {
-					margin-right: 10rpx;
-					width: 116rpx;
-					height: 42rpx;
-					background: #F5F5F5;
-					border-radius: 4rpx 4rpx 4rpx 4rpx;
-					opacity: 1;
-					text-align: center;
-					line-height: 42rpx;
-					font-size: 24rpx;
-					font-weight: 400;
-					color: #818181;
-				}
-			}
-			.tipRight{
-				display: flex;
-				align-items: center;
-				.ask {
-					margin-left: 16rpx;
-				
-					position: relative;
-					top: -20rpx;
-				
-					.weChat {
-						width: 32rpx;
-						height: 32rpx;
-					}
-				
-					.askText {
-						height: 28rpx;
-						font-size: 20rpx;
-						font-weight: 400;
-						color: #989898;
-						line-height: 28rpx;
-					}
-				}
-			}
-			
-
-			.al {
-				width: 0rpx;
-				height: 52rpx;
-				opacity: 1;
-				border: 1rpx solid #E5E5E5;
-				margin-left: 8rpx;
-			}
-
-			
-		}
-
-		.hline {
-			width: 656rpx;
-			height: 0rpx;
-			opacity: 1;
-			border: 2rpx solid #F2F2F2;
-			margin: 32rpx 0 24rpx 0;
-		}
-
-		.shopAddress {
-			display: flex;
-			justify-content: space-between;
-
-			.address {
-				.ad {
-					height: 40rpx;
-					font-size: 28rpx;
-					font-family: PingFang SC, PingFang SC;
-					font-weight: 400;
-					color: #2B2B2B;
-					line-height: 40rpx;
-				}
-
-				.adInfo {
-					min-height: 40rpx;
-					font-size: 28rpx;
-					font-family: PingFang SC, PingFang SC;
-					font-weight: 400;
-					color: #818181;
-					line-height: 40rpx;
-				}
-			}
-
-			.pCar {
-				display: flex;
-				flex-direction: column;
-				align-items: center;
-
-				.p {
-					width: 54rpx;
-					height: 54rpx;
-				}
-
-				.car {
-					height: 28rpx;
-					font-size: 20rpx;
-					font-weight: 400;
-					color: #989898;
-					line-height: 28rpx;
-				}
-			}
-		}
-	}
-
-	.shopGoods {
-		width: 698rpx;
-		height: 226rpx;
-		background: #FFFFFF;
-		border-radius: 8rpx 8rpx 8rpx 8rpx;
-		opacity: 1;
-		margin: 10rpx 0 0 26rpx;
-		position: relative;
-		top: -226rpx;
-
-		.fli {
-			width: 100%;
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-			padding: 16rpx 28rpx 0 34rpx;
-
-			.xh {
-				font-size: 28rpx;
-				font-family: PingFang SC, PingFang SC;
-				font-weight: 500;
-				color: #000000;
-				line-height: 40rpx;
-
-				text {
-					margin-left: 10rpx;
-					font-size: 28rpx;
-					font-family: PingFang SC, PingFang SC;
-					font-weight: 500;
-					color: #909090;
-				}
-			}
-
-			.lookMore {
-				font-size: 24rpx;
-				font-family: PingFang SC, PingFang SC;
-				font-weight: 400;
-				color: #909090;
-				line-height: 34rpx;
-			}
-		}
-
-		.steps {
-			margin-left: 34rpx;
-		}
-
-		.customerEvalu {
-			.cusInfo {
-				width: 100%;
-				display: flex;
-				justify-content: space-between;
-				align-items: center;
-
-				.cusLeft {
-					.ch {
-						width: 74rpx;
-						height: 74rpx;
-						margin-right: 18rpx;
-						margin-left: 48rpx;
-					}
-				}
-
-				.day {
-					height: 34rpx;
-					font-size: 24rpx;
-					font-family: PingFang SC, PingFang SC;
-					font-weight: 400;
-					color: #BBBBBB;
-					line-height: 34rpx;
-					margin-right: 32rpx;
-				}
-			}
-
-			.evaluateInfo {
-				height: 40rpx;
-				font-size: 28rpx;
-				font-family: PingFang SC, PingFang SC;
-				font-weight: 400;
-				color: #515151;
-				line-height: 40rpx;
-				margin-left: 48rpx;
-			}
-		}
-
-		.evaLine {
-			width: 618rpx;
-			height: 0rpx;
-			opacity: 1;
-			border: 2rpx solid #EFEFEF;
-			margin: 30rpx 0 26rpx 0;
-		}
-
-		.shopGoodsList {
-			display: flex;
-			align-items: center;
-			margin-top: 10rpx;
-			justify-content: space-around;
-
-			.listItem {
-				display: flex;
-				flex-direction: column;
-				align-items: center;
-
-				.itemGoodsImg {
-					width: 100rpx;
-					height: 100rpx;
-				}
-
-				.itemGoodsName {
-					width: 100rpx;
-					height: 28rpx;
-					font-size: 20rpx;
-					font-family: PingFang SC, PingFang SC;
-					font-weight: 400;
-					color: #1E1E1E;
-					line-height: 28rpx;
-					text-align: center;
-				}
-			}
-		}
-
-		.pictureList {
-			display: flex;
-			margin-top: 20rpx;
-			padding-left: 26rpx;
-
-			.picItem {
-				width: 202rpx;
-				height: 246rpx;
-				margin-right: 26rpx;
-
-				.pic {
-					width: 100%;
-					height: 100%;
-				}
-			}
-		}
-	}
-
-	.sameCityServe {
-		height: 338rpx;
-	}
-
-	.shopEvaluate {
-		height: 580rpx;
-	}
-
-	.shopHistory {
-		height: 800rpx;
-	}
-</style>
\ No newline at end of file
diff --git a/pages/order/detail - 副本.vue b/pages/order/detail - 副本.vue
deleted file mode 100644
index f8c2dc5..0000000
--- a/pages/order/detail - 副本.vue	
+++ /dev/null
@@ -1,915 +0,0 @@
-<template>
-  <view v-if="!isLoading" class="container" :style="appThemeStyle">
-
-    <view class="header">
-      <!-- 订单状态 -->
-      <view class="order-status">
-        <view class="status-icon">
-          <!-- 进行中的订单 -->
-          <block v-if="order.order_status == OrderStatusEnum.NORMAL.value">
-            <!-- 待支付 -->
-            <block v-if="order.pay_status == PayStatusEnum.PENDING.value">
-              <image class="image" src="/static/order/status/wait_pay.png" mode="aspectFit"></image>
-            </block>
-            <!-- 待发货 -->
-            <block v-else-if="order.delivery_status == DeliveryStatusEnum.NOT_DELIVERED.value">
-              <image class="image" src="/static/order/status/wait_deliver.png" mode="aspectFit"></image>
-            </block>
-            <!-- 待收货 -->
-            <block v-else-if="order.receipt_status == ReceiptStatusEnum.NOT_RECEIVED.value">
-              <image class="image" src="/static/order/status/wait_receipt.png" mode="aspectFit"></image>
-            </block>
-          </block>
-          <!-- 已完成 -->
-          <block v-if="order.order_status == OrderStatusEnum.COMPLETED.value">
-            <image class="image" src="/static/order/status/received.png" mode="aspectFit"></image>
-          </block>
-          <!-- 已取消/待取消 -->
-          <block v-if="order.order_status == OrderStatusEnum.CANCELLED.value || order.order_status == OrderStatusEnum.APPLY_CANCEL.value">
-            <image class="image" src="/static/order/status/close.png" mode="aspectFit"></image>
-          </block>
-        </view>
-        <view class="status-text">
-          <text>{{ order.state_text }}</text>
-        </view>
-      </view>
-      <!-- 下一步操作 -->
-      <view class="next-action" v-if="order.order_status == OrderStatusEnum.NORMAL.value">
-        <view v-if="order.pay_status == PayStatusEnum.PENDING.value" class="action-btn" @click="onPay(order.order_id)">
-          去支付</view>
-        <view
-          v-if="order.delivery_status == DeliveryStatusEnum.DELIVERED.value && order.receipt_status == ReceiptStatusEnum.NOT_RECEIVED.value"
-          class="action-btn" @click="onReceipt(order.order_id)">确认收货</view>
-      </view>
-    </view>
-
-    <view class="card-area">
-      <!-- 实物订单 -->
-      <block v-if="order.order_type == OrderTypeEnum.PHYSICAL.value">
-        <!-- 快递配送：配送地址 -->
-        <view v-if="order.delivery_type == DeliveryTypeEnum.EXPRESS.value" class="delivery-address i-card">
-          <view class="link-man">
-            <text class="name">{{ order.address.name }}</text>
-            <text class="phone">{{ order.address.phone }}</text>
-          </view>
-          <view class="address">
-            <text class="region" v-for="(region, idx) in order.address.region" :key="idx">{{ region }}</text>
-            <text class="detail">{{ order.address.detail }}</text>
-          </view>
-        </view>
-
-        <!-- 快递配送：门店自提 -->
-        <view v-if="order.delivery_type == DeliveryTypeEnum.EXTRACT.value" class="delivery-extract i-card"
-          @click="handleTargetExtract(order.extract_shop.shop_id)">
-          <view class="extract-top">
-            <text class="title">自提门店</text>
-            <text class="subtitle">您须到该自提点取货</text>
-          </view>
-          <view class="shop-info">
-            <view class="icon-location">
-              <text class="iconfont icon-dingwei"></text>
-            </view>
-            <view class="shop-content">
-              <view class="shop-name">
-                <text>{{ order.extract_shop.shop_name }}</text>
-              </view>
-              <view class="shop-describe">
-                <text class="item-text">{{ order.extract_shop.region.province }}</text>
-                <text class="item-text">{{ order.extract_shop.region.city }}</text>
-                <text class="item-text">{{ order.extract_shop.region.region }}</text>
-                <text class="item-text">{{ order.extract_shop.address }}</text>
-              </view>
-            </view>
-            <view class="icon-arrow">
-              <text class="iconfont icon-arrow-right"></text>
-            </view>
-          </view>
-        </view>
-      </block>
-
-      <!-- 物流信息 -->
-      <view v-if="order.delivery_type == DeliveryTypeEnum.EXPRESS.value
-       && order.delivery_status == DeliveryStatusEnum.DELIVERED.value
-        && order.delivery
-         && order.delivery.length" class="express i-card" @click="handleTargetExpress()">
-        <view v-if="order.delivery.length > 1" class="main">
-          <view class="info-item">
-            <view class="item-content">
-              <text>订单已拆分多个包裹发货</text>
-            </view>
-          </view>
-          <view class="info-item">
-            <view class="item-content">
-              <text>已发货{{ order.delivery.length }}个包裹</text>
-            </view>
-          </view>
-        </view>
-        <view v-else class="main">
-          <view class="info-item">
-            <view class="item-lable">物流公司</view>
-            <view class="item-content">
-              <text
-                v-if="order.delivery[0].delivery_method != DeliveryMethodEnum.UNWANTED.value">{{ order.delivery[0].express ? order.delivery[0].express.express_name : '--' }}</text>
-              <text v-else>无需物流</text>
-            </view>
-          </view>
-          <view class="info-item">
-            <view class="item-lable">物流单号</view>
-            <view class="item-content">
-              <text>{{ order.delivery[0].express_no ? order.delivery[0].express_no : '--' }}</text>
-              <view v-if="order.delivery[0].express_no" class="act-copy" @click.stop="handleCopy(order.delivery[0].express_no)">
-                <text>复制</text>
-              </view>
-            </view>
-          </view>
-        </view>
-        <view class="right-arrow">
-          <text class="iconfont icon-arrow-right"></text>
-        </view>
-      </view>
-
-      <!-- 商品列表 -->
-      <view class="goods-list i-card">
-        <view class="goods-item" v-for="(goods, idx) in order.goods" :key="idx">
-          <view class="goods-main" @click="handleTargetGoods(goods.goods_id)">
-            <!-- 商品图片 -->
-            <view class="goods-image">
-              <image class="image" :src="goods.goods_image" mode="scaleToFill"></image>
-            </view>
-            <!-- 商品信息 -->
-            <view class="goods-content">
-              <view class="goods-title"><text class="twoline-hide">{{ goods.goods_name }}</text></view>
-              <view class="goods-props clearfix">
-                <view class="goods-props-item" v-for="(props, idx) in goods.goods_props" :key="idx">
-                  <text>{{ props.value.name }}</text>
-                </view>
-              </view>
-            </view>
-            <!-- 交易信息 -->
-            <view class="goods-trade">
-              <view class="goods-price">
-                <text class="unit">￥</text>
-                <text class="value">{{ goods.is_user_grade ? goods.grade_goods_price : goods.goods_price }}</text>
-              </view>
-              <view class="goods-num">
-                <text>×{{ goods.total_num }}</text>
-              </view>
-            </view>
-          </view>
-          <!-- 商品售后 -->
-          <view class="goods-refund">
-            <text v-if="goods.refund" class="stata-text">已申请售后</text>
-            <view v-else-if="order.isAllowRefund" class="action-btn" @click.stop="handleApplyRefund(goods.order_goods_id)">申请售后</view>
-          </view>
-        </view>
-      </view>
-
-      <!-- 订单信息 -->
-      <view class="order-info i-card">
-        <view class="info-item">
-          <view class="item-lable">订单编号</view>
-          <view class="item-content">
-            <text>{{ order.order_no }}</text>
-            <view class="act-copy" @click="handleCopy(order.order_no)">
-              <text>复制</text>
-            </view>
-          </view>
-        </view>
-        <view class="info-item">
-          <view class="item-lable">下单时间</view>
-          <view class="item-content">
-            <text>{{ order.create_time }}</text>
-          </view>
-        </view>
-        <view class="info-item">
-          <view class="item-lable">买家留言</view>
-          <view class="item-content">
-            <text>{{ order.buyer_remark ? order.buyer_remark : '--' }}</text>
-          </view>
-        </view>
-      </view>
-
-      <!-- 结算信息 -->
-      <view class="trade-info i-card">
-        <view class="info-item">
-          <view class="item-lable">订单金额</view>
-          <view class="item-content">
-            <text>￥{{ order.total_price }}</text>
-          </view>
-        </view>
-        <view v-if="order.coupon_money > 0" class="info-item">
-          <view class="item-lable">优惠券抵扣</view>
-          <view class="item-content">
-            <text>-￥{{ order.coupon_money }}</text>
-          </view>
-        </view>
-        <view v-if="order.points_money > 0" class="info-item">
-          <view class="item-lable">{{ setting.points_name }}抵扣</view>
-          <view class="item-content">
-            <text>-￥{{ order.points_money }}</text>
-          </view>
-        </view>
-        <view class="info-item">
-          <view class="item-lable">运费</view>
-          <view class="item-content">
-            <text>+￥{{ order.express_price }}</text>
-          </view>
-        </view>
-        <view v-if="order.update_price.value != '0.00'" class="info-item">
-          <view class="item-lable">后台改价</view>
-          <view class="item-content">
-            <text>{{ order.update_price.symbol }}</text>
-            <text>￥{{ order.update_price.value }}</text>
-          </view>
-        </view>
-        <view class="divider"></view>
-        <view class="trade-total">
-          <text class="lable">实付款</text>
-          <view class="goods-price">
-            <text class="unit">￥</text>
-            <text class="value">{{ order.pay_price }}</text>
-          </view>
-        </view>
-      </view>
-    </view>
-
-    <!-- 底部操作按钮 -->
-    <view v-if="order.order_status != OrderStatusEnum.CANCELLED.value" class="footer-fixed">
-      <view class="btn-wrapper">
-        <!-- 未支付取消订单 -->
-        <block v-if="order.pay_status == PayStatusEnum.PENDING.value">
-          <view class="btn-item" @click="onCancel(order.order_id)">取消</view>
-        </block>
-        <!-- 已支付进行中的订单 -->
-        <block v-if="order.order_status != OrderStatusEnum.APPLY_CANCEL.value">
-          <block v-if="order.pay_status == PayStatusEnum.SUCCESS.value && order.delivery_status == DeliveryStatusEnum.NOT_DELIVERED.value">
-            <view class="btn-item" @click="onCancel(order.order_id)">申请取消</view>
-          </block>
-          <!-- 订单核销码 -->
-          <block v-if="order.pay_status == PayStatusEnum.SUCCESS.value && order.delivery_type == DeliveryTypeEnum.EXTRACT.value
-           && order.delivery_status == DeliveryStatusEnum.NOT_DELIVERED.value">
-            <view class="btn-item active" @click="onExtractQRCode(order.order_id)">
-              <text class="iconfont icon-qr-extract"></text>
-              <text class="m-l-10">核销码</text>
-            </view>
-          </block>
-        </block>
-        <!-- 已申请取消 -->
-        <view v-else class="f-28 col-8">取消申请中</view>
-        <!-- 未支付的订单 -->
-        <block v-if="order.pay_status == PayStatusEnum.PENDING.value">
-          <view class="btn-item active" @click="onPay(order.order_id)">去支付</view>
-        </block>
-        <!-- 确认收货 -->
-        <block
-          v-if="order.delivery_status == DeliveryStatusEnum.DELIVERED.value && order.receipt_status == ReceiptStatusEnum.NOT_RECEIVED.value">
-          <view class="btn-item active" @click="onReceipt(order.order_id)">确认收货</view>
-        </block>
-        <!-- 订单评价 -->
-        <block v-if="order.order_status == OrderStatusEnum.COMPLETED.value && order.is_comment == 0">
-          <view class="btn-item" @click="handleTargetComment(order.order_id)">评价</view>
-        </block>
-      </view>
-    </view>
-
-    <!-- 核销二维码弹窗 -->
-    <u-popup v-model="showQRCodePopup" mode="center" border-radius="26" :closeable="true">
-      <view class="qrcode-popup">
-        <view class="title">自提核销二维码</view>
-        <view class="pop-content">
-          <image v-if="qrcodeImage" class="image" :src="qrcodeImage"></image>
-        </view>
-      </view>
-    </u-popup>
-
-  </view>
-</template>
-
-<script>
-  import {
-    OrderTypeEnum,
-    DeliveryStatusEnum,
-    DeliveryTypeEnum,
-    OrderStatusEnum,
-    PayStatusEnum,
-    ReceiptStatusEnum
-  } from '@/common/enum/order'
-  import { DeliveryMethodEnum } from '@/common/enum/order/delivery'
-  import * as OrderApi from '@/api/order'
-
-  export default {
-    data() {
-      return {
-        // 枚举类
-        OrderTypeEnum,
-        DeliveryStatusEnum,
-        DeliveryTypeEnum,
-        OrderStatusEnum,
-        PayStatusEnum,
-        ReceiptStatusEnum,
-        DeliveryMethodEnum,
-        // 当前订单ID
-        orderId: null,
-        // 加载中
-        isLoading: true,
-        // 当前订单详情
-        order: {},
-        // 当前设置
-        setting: {},
-        // 核销二维码弹窗
-        showQRCodePopup: false,
-        // 核销二维码图片url (通过后端获取)
-        qrcodeImage: '',
-        // 控制onShow事件是否刷新订单信息
-        canReset: false,
-      }
-    },
-
-    /**
-     * 生命周期函数--监听页面加载
-     */
-    onLoad({ orderId }) {
-      // 当前订单ID
-      this.orderId = orderId
-      // 获取当前订单信息
-      this.getOrderDetail()
-      // 注册全局事件订阅: 是否刷新当前订单数据
-      uni.$on('syncRefresh', (val, isCur) => {
-        if (!isCur) {
-          this.canReset = val
-        }
-      })
-    },
-
-    /**
-     * 生命周期函数--监听页面显示
-     */
-    onShow() {
-      this.canReset && this.getOrderDetail()
-      this.canReset = false
-    },
-
-    methods: {
-
-      // 获取当前订单信息
-      getOrderDetail(canReset = false) {
-        const app = this
-        app.isLoading = true
-        OrderApi.detail(app.orderId)
-          .then(result => {
-            app.order = result.data.order
-            app.setting = result.data.setting
-            app.isLoading = false
-          })
-        // 相应全局事件订阅: 刷新上级页面数据
-        canReset && uni.$emit('syncRefresh', true, true)
-      },
-
-      // 复制指定内容
-      handleCopy(value) {
-        const app = this
-        uni.setClipboardData({
-          data: value,
-          success: () => app.$toast('复制成功'),
-          fail: ({ errMsg }) => app.$toast('复制失败 ' + errMsg)
-        })
-      },
-
-      // 跳转到门店详情页
-      handleTargetExtract(shopId) {
-        this.$navTo('pages/shop/detail', { shopId })
-      },
-
-      // 跳转到物流跟踪页面
-      handleTargetExpress() {
-        this.$navTo('pages/order/express/index', { orderId: this.orderId })
-      },
-
-      // 跳转到商品详情页面
-      handleTargetGoods(goodsId) {
-        this.$navTo('pages/goods/detail', { goodsId })
-      },
-
-      // 跳转到申请售后页面
-      handleApplyRefund(orderGoodsId) {
-        this.$navTo('pages/refund/apply', { orderGoodsId })
-      },
-
-      // 取消订单
-      onCancel(orderId) {
-        const app = this
-        uni.showModal({
-          title: '友情提示',
-          content: '确认要取消该订单吗？',
-          success(o) {
-            if (o.confirm) {
-              OrderApi.cancel(orderId)
-                .then(result => {
-                  // 显示成功信息
-                  app.$toast(result.message)
-                  setTimeout(() => {
-                    // 刷新当前订单数据
-                    app.getOrderDetail(true)
-                  }, 1500)
-                })
-            }
-          }
-        });
-      },
-
-      // 确认收货
-      onReceipt(orderId) {
-        const app = this
-        uni.showModal({
-          title: '友情提示',
-          content: '确认收到商品了吗？',
-          success(o) {
-            if (o.confirm) {
-              OrderApi.receipt(orderId)
-                .then(result => {
-                  // 显示成功信息
-                  app.$success(result.message)
-                  setTimeout(() => {
-                    // 刷新当前订单数据
-                    app.getOrderDetail(true)
-                  }, 1500)
-                })
-            }
-          }
-        });
-      },
-
-      // 获取核销二维码
-      onExtractQRCode(orderId) {
-        const app = this
-        OrderApi.extractQrcode(orderId, { channel: app.platform })
-          .then(result => {
-            app.qrcodeImage = result.data.qrcode
-            app.showQRCodePopup = true
-          })
-      },
-
-      // 点击去支付
-      onPay(orderId) {
-        this.$navTo('pages/checkout/cashier/index', { orderId })
-      },
-
-      // 跳转到订单评价页
-      handleTargetComment(orderId) {
-        this.$navTo('pages/order/comment/index', { orderId })
-      },
-
-    },
-
-  }
-</script>
-
-<style>
-  page {
-    background: #f4f4f4;
-  }
-</style>
-<style lang="scss" scoped>
-  .container {
-    // 设置ios刘海屏底部横线安全区域
-    padding-bottom: calc(constant(safe-area-inset-bottom) + 106rpx + 6rpx);
-    padding-bottom: calc(env(safe-area-inset-bottom) + 106rpx + 6rpx);
-  }
-
-  // 页面顶部
-  .header {
-    display: flex;
-    justify-content: space-between;
-    background-color: #e8c269;
-    height: 280rpx;
-    padding: 56rpx 30rpx 0 30rpx;
-
-    .order-status {
-      display: flex;
-      align-items: center;
-      height: 128rpx;
-
-      .status-icon {
-        width: 128rpx;
-        height: 128rpx;
-
-        .image {
-          display: block;
-          width: 100%;
-          height: 100%;
-        }
-      }
-
-      .status-text {
-        padding-left: 20rpx;
-        color: #fff;
-        font-size: 38rpx;
-        font-weight: bold;
-      }
-    }
-
-    .next-action {
-      display: flex;
-      align-items: center;
-      height: 128rpx;
-
-      .action-btn {
-        min-width: 152rpx;
-        height: 56rpx;
-        padding: 0 30rpx;
-        background-color: #fff;
-        border-radius: 28rpx;
-        border-color: rgb(102, 102, 102);
-        cursor: pointer;
-        user-select: none;
-        color: #c7a157;
-        display: flex;
-        justify-content: center;
-        align-items: center;
-      }
-    }
-  }
-
-  // 卡片区域
-  .card-area {
-    margin-top: -50rpx;
-  }
-
-  // 通栏卡片
-  .i-card {
-    background: #fff;
-    padding: 24rpx 24rpx;
-    width: 94%;
-    box-shadow: 0 1rpx 5rpx 0px rgba(0, 0, 0, 0.05);
-    margin: 0 auto 20rpx auto;
-    border-radius: 20rpx;
-  }
-
-  // 自提门店
-  .delivery-extract {
-
-    .extract-top {
-      margin-bottom: 20rpx;
-
-      .title {
-        font-size: 28rpx;
-        margin-right: 30rpx;
-      }
-
-      .subtitle {
-        font-size: 24rpx;
-        color: #888;
-      }
-    }
-
-    .shop-info {
-      display: flex;
-      align-items: center;
-    }
-
-    .icon-location {
-      font-size: 34rpx;
-    }
-
-    .shop-content {
-      flex: 1;
-      margin-left: 26rpx;
-      font-size: 24rpx;
-
-      .shop-name {
-        font-size: 28rpx;
-        margin-bottom: 8rpx;
-      }
-
-      .shop-describe {
-        color: #777;
-
-        .item-text {
-          margin-right: 8rpx;
-        }
-      }
-    }
-  }
-
-  // 收货地址
-  .delivery-address {
-
-    .link-man {
-      line-height: 46rpx;
-      color: #333;
-
-      .name {
-        margin-right: 10rpx;
-      }
-    }
-
-    .address {
-      margin-top: 12rpx;
-      color: #999;
-      font-size: 24rpx;
-
-      .detail {
-        margin-left: 6rpx;
-      }
-    }
-
-  }
-
-  // 物流公司
-  .express {
-    display: flex;
-    align-items: center;
-
-    .main {
-      flex: 1;
-    }
-
-    .info-item {
-      display: flex;
-      margin-bottom: 20rpx;
-
-      &:last-child {
-        margin-bottom: 0;
-      }
-
-      .item-lable {
-        display: flex;
-        align-items: center;
-        font-size: 24rpx;
-        color: #999;
-        margin-right: 30rpx;
-      }
-
-      .item-content {
-        flex: 1;
-        display: flex;
-        align-items: center;
-        font-size: 26rpx;
-        color: #333;
-
-        .act-copy {
-          margin-left: 20rpx;
-          padding: 2rpx 20rpx;
-          font-size: 22rpx;
-          color: #666;
-          border: 1rpx solid #c1c1c1;
-          border-radius: 16rpx;
-        }
-      }
-    }
-
-    // 右侧箭头
-    .right-arrow {
-      margin-left: 16rpx;
-      font-size: 26rpx;
-    }
-
-  }
-
-  // 商品列表
-  .goods-list {
-
-    // 商品项
-    .goods-item {
-      margin-bottom: 40rpx;
-
-      &:last-child {
-        margin-bottom: 0;
-      }
-
-      // 商品信息
-      .goods-main {
-        display: flex;
-      }
-
-      // 商品图片
-      .goods-image {
-        width: 180rpx;
-        height: 180rpx;
-
-        .image {
-          display: block;
-          width: 100%;
-          height: 100%;
-          border-radius: 8rpx;
-        }
-      }
-
-      // 商品内容
-      .goods-content {
-        flex: 1;
-        padding-left: 16rpx;
-        padding-top: 16rpx;
-
-        .goods-title {
-          font-size: 26rpx;
-          max-height: 76rpx;
-        }
-
-        .goods-props {
-          margin-top: 14rpx;
-          color: #ababab;
-          font-size: 24rpx;
-          overflow: hidden;
-
-          .goods-props-item {
-            padding: 4rpx 16rpx;
-            border-radius: 12rpx;
-            background-color: #fcfcfc;
-          }
-        }
-
-
-      }
-
-      // 交易信息
-      .goods-trade {
-        padding-top: 16rpx;
-        width: 150rpx;
-        text-align: right;
-        color: $uni-text-color-grey;
-        font-size: 26rpx;
-
-        .goods-price {
-          vertical-align: bottom;
-          margin-bottom: 16rpx;
-
-          .unit {
-            margin-right: -2rpx;
-            font-size: 24rpx;
-          }
-        }
-      }
-
-      // 商品售后
-      .goods-refund {
-        display: flex;
-        justify-content: flex-end;
-
-        .stata-text {
-          font-size: 24rpx;
-          color: #999;
-        }
-
-        .action-btn {
-          border-radius: 28rpx;
-          padding: 8rpx 26rpx;
-          font-size: 24rpx;
-          color: #383838;
-          border: 1rpx solid #a8a8a8;
-        }
-
-      }
-
-    }
-
-  }
-
-  // 订单信息
-  .order-info {
-
-    .info-item {
-      display: flex;
-      margin-bottom: 24rpx;
-
-      &:last-child {
-        margin-bottom: 0;
-      }
-
-      .item-lable {
-        display: flex;
-        align-items: center;
-        font-size: 24rpx;
-        color: #999;
-        margin-right: 30rpx;
-      }
-
-      .item-content {
-        flex: 1;
-        display: flex;
-        align-items: center;
-        font-size: 26rpx;
-        color: #333;
-
-        .act-copy {
-          margin-left: 20rpx;
-          padding: 2rpx 20rpx;
-          font-size: 22rpx;
-          color: #666;
-          border: 1rpx solid #c1c1c1;
-          border-radius: 16rpx;
-        }
-      }
-    }
-
-  }
-
-  // 交易信息
-  .trade-info {
-
-    .info-item {
-      display: flex;
-      margin-bottom: 24rpx;
-
-      .item-lable {
-        font-size: 24rpx;
-        color: #999;
-        margin-right: 24rpx;
-      }
-
-      .item-content {
-        flex: 1;
-        font-size: 26rpx;
-        color: #333;
-        text-align: right;
-      }
-    }
-
-    .divider {
-      height: 1rpx;
-      background: #f1f1f1;
-      margin-bottom: 24rpx;
-    }
-
-    .trade-total {
-      display: flex;
-      justify-content: flex-end;
-
-      .goods-price {
-        margin-left: 12rpx;
-        vertical-align: bottom;
-        color: $main-bg;
-
-        .unit {
-          margin-right: -2rpx;
-          font-size: 24rpx;
-        }
-      }
-    }
-
-  }
-
-  // 底部操作栏
-  .footer-fixed {
-    position: fixed;
-    bottom: var(--window-bottom);
-    left: 0;
-    right: 0;
-    z-index: 11;
-    box-shadow: 0 -4rpx 40rpx 0 rgba(151, 151, 151, 0.24);
-    background: #fff;
-
-    // 设置ios刘海屏底部横线安全区域
-    padding-bottom: constant(safe-area-inset-bottom);
-    padding-bottom: env(safe-area-inset-bottom);
-
-    .btn-wrapper {
-      height: 106rpx;
-      display: flex;
-      align-items: center;
-      justify-content: flex-end;
-      padding: 0 30rpx;
-    }
-
-    .btn-item {
-      min-width: 180rpx;
-      border-radius: 30rpx;
-      padding: 12rpx 26rpx;
-      font-size: 28rpx;
-      color: #383838;
-      text-align: center;
-      border: 1rpx solid #a8a8a8;
-      margin-left: 24rpx;
-
-      &.active {
-        border: none;
-        background: linear-gradient(to right, $main-bg, $main-bg2);
-        color: $main-text;
-      }
-    }
-  }
-
-  // 弹出层 - 核销二维码
-  .qrcode-popup {
-    padding: 36rpx 30rpx;
-
-    .title {
-      font-size: 30rpx;
-      margin-bottom: 26rpx;
-      font-weight: bold;
-      text-align: center;
-    }
-
-    .pop-content {
-      min-height: 260rpx;
-      padding: 0 10rpx;
-
-      .image {
-        display: block;
-        width: 510rpx;
-        height: 510rpx;
-      }
-
-    }
-  }
-</style>
\ No newline at end of file
diff --git a/pages/order/index2.vue b/pages/order/index2.vue
deleted file mode 100644
index cfa6b64..0000000
--- a/pages/order/index2.vue
+++ /dev/null
@@ -1,523 +0,0 @@
-<template>
-  <view class="container" :style="appThemeStyle">
-    <mescroll-body ref="mescrollRef" :sticky="true" @init="mescrollInit" :down="{ native: true }" @down="downCallback" :up="upOption"
-      @up="upCallback">
-      <!-- tab栏 -->
-      <u-tabs :list="tabs" :is-scroll="false" :current="curTab" :active-color="appTheme.mainBg" :duration="0.2" @change="onChangeTab" />
-      <!-- 订单列表 -->
-      <view class="order-list">
-        <view class="order-item" v-for="(item, index) in list.data" :key="index">
-          <view class="item-top">
-            <view class="item-top-left">
-              <text class="order-time">{{ item.create_time }}</text>
-            </view>
-            <view class="item-top-right">
-              <text class="state-text" :style="{{(item.pay_status == PayStatusEnum.PENDING.value?'color:#05C669':'color:#FF2F2F')}}">{{ item.state_text }}</text>
-            </view>
-          </view>
-          <!-- 商品列表 -->
-          <view class="goods-list" @click="handleTargetDetail(item.order_id)">
-            <view class="goods-item" v-for="(goods, idx) in item.goods" :key="idx">
-              <!-- 商品图片 -->
-              <view class="goods-image">
-                <image class="image" :src="goods.goods_image" mode="scaleToFill"></image>
-              </view>
-              <!-- 商品信息 -->
-              <view class="goods-content">
-                <view class="goods-title"><text class="twoline-hide">{{ goods.goods_name }}</text></view>
-                <view class="goods-props clearfix">
-                  <view class="goods-props-item" v-for="(props, idx) in goods.goods_props" :key="idx">
-                    <text>{{ props.value.name }}</text>
-                  </view>
-                </view>
-              </view>
-              <!-- 交易信息 -->
-              <view class="goods-trade">
-                <view class="goods-price">
-                  <text class="unit">￥</text>
-                  <text class="value">{{ goods.is_user_grade ? goods.grade_goods_price : goods.goods_price }}</text>
-                </view>
-                <view class="goods-num">
-                  <text>×{{ goods.total_num }}</text>
-                </view>
-              </view>
-            </view>
-          </view>
-          <!-- 订单合计 -->
-          <view class="order-total">
-            <text>共{{ item.total_num }}件商品，总金额</text>
-            <text class="unit">￥</text>
-            <text class="money">{{ item.pay_price }}</text>
-          </view>
-          <!-- 订单操作 -->
-          <view v-if="item.order_status != OrderStatusEnum.CANCELLED.value" class="order-handle">
-            <view class="btn-group clearfix">
-              <!-- 未支付取消订单 -->
-              <block v-if="item.pay_status == PayStatusEnum.PENDING.value">
-                <view class="btn-item" @click="onCancel(item.order_id)">取消</view>
-              </block>
-              <!-- 已支付进行中的订单 -->
-              <block v-if="item.order_status != OrderStatusEnum.APPLY_CANCEL.value">
-                <block v-if="item.pay_status == PayStatusEnum.SUCCESS.value && item.delivery_status == DeliveryStatusEnum.NOT_DELIVERED.value">
-                  <view class="btn-item" @click="onCancel(item.order_id)">申请取消</view>
-                </block>
-                <!-- 订单核销码 -->
-                <block v-if="item.pay_status == PayStatusEnum.SUCCESS.value && item.delivery_type == DeliveryTypeEnum.EXTRACT.value
-                 && item.delivery_status == DeliveryStatusEnum.NOT_DELIVERED.value">
-                  <view class="btn-item active" @click="onExtractQRCode(item.order_id)">
-                    <text class="iconfont icon-qr-extract"></text>
-                    <text class="m-l-10">核销码</text>
-                  </view>
-                </block>
-              </block>
-              <!-- 已申请取消 -->
-              <view v-else class="f-28 col-8">取消申请中</view>
-              <!-- 未支付的订单 -->
-              <block v-if="item.pay_status == PayStatusEnum.PENDING.value">
-                <view class="btn-item active" @click="onPay(item.order_id)">去支付</view>
-              </block>
-              <!-- 确认收货 -->
-              <block v-if="item.delivery_status == DeliveryStatusEnum.DELIVERED.value && item.receipt_status == ReceiptStatusEnum.NOT_RECEIVED.value">
-                <view class="btn-item active"  @click="onReceipt(item.order_id)">确认收货</view>
-              </block>
-              <!-- 订单评价 -->
-              <block v-if="item.order_status == OrderStatusEnum.COMPLETED.value && item.is_comment == 0">
-                <view class="btn-item" @click="handleTargetComment(item.order_id)">评价</view>
-              </block>
-            </view>
-          </view>
-        </view>
-      </view>
-    </mescroll-body>
-    <!-- 核销二维码弹窗 -->
-    <u-popup v-model="showQRCodePopup" mode="center" border-radius="26" :closeable="true">
-      <view class="qrcode-popup">
-        <view class="title">自提核销二维码</view>
-        <view class="pop-content">
-          <image v-if="qrcodeImage" class="image" :src="qrcodeImage"></image>
-        </view>
-      </view>
-    </u-popup>
-  </view>
-</template>
-
-<script>
-  import {
-    DeliveryStatusEnum,
-    DeliveryTypeEnum,
-    OrderStatusEnum,
-    PayStatusEnum,
-    ReceiptStatusEnum
-  } from '@/common/enum/order'
-  import MescrollMixin from '@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-mixins'
-  import { getEmptyPaginateObj, getMoreListData } from '@/core/app'
-  import * as OrderApi from '@/api/order'
-
-  // 每页记录数量
-  const pageSize = 15
-
-  // tab栏数据
-  const tabs = [{
-    name: `全部`,
-    value: 'all'
-  }, {
-    name: `待支付`,
-    value: 'payment'
-  }, {
-    name: `待发货`,
-    value: 'delivery'
-  }, {
-    name: `待收货`,
-    value: 'received'
-  }, {
-    name: `待评价`,
-    value: 'comment'
-  }]
-
-  export default {
-    mixins: [MescrollMixin],
-    data() {
-      return {
-        // 枚举类
-        DeliveryStatusEnum,
-        DeliveryTypeEnum,
-        OrderStatusEnum,
-        PayStatusEnum,
-        ReceiptStatusEnum,
-
-        // 当前页面参数
-        options: { dataType: 'all' },
-        // tab栏数据
-        tabs,
-        // 当前标签索引
-        curTab: 0,
-        // 订单列表数据
-        list: getEmptyPaginateObj(),
-
-        // 上拉加载配置
-        upOption: {
-          // 首次自动执行
-          auto: true,
-          // 每页数据的数量; 默认10
-          page: { size: pageSize },
-          // 数量要大于4条才显示无更多数据
-          noMoreSize: 4,
-          // 空布局
-          empty: {
-            tip: '亲，暂无订单记录'
-          }
-        },
-        // 控制onShow事件是否刷新订单列表
-        canReset: false,
-        // 核销二维码弹窗
-        showQRCodePopup: false,
-        // 核销二维码图片url (通过后端获取)
-        qrcodeImage: '',
-      }
-    },
-
-    /**
-     * 生命周期函数--监听页面加载
-     */
-    onLoad(options) {
-      // 初始化当前选中的标签
-      this.initCurTab(options)
-      // 注册全局事件订阅: 是否刷新订单列表
-      uni.$on('syncRefresh', canReset => {
-        this.canReset = canReset
-      })
-    },
-
-    /**
-     * 生命周期函数--监听页面显示
-     */
-    onShow() {
-      this.canReset && this.onRefreshList()
-      this.canReset = false
-    },
-
-    /**
-     * 生命周期函数--监听页面的卸载
-     */
-    onUnload() {
-      // 卸载全局事件订阅
-      uni.$off('syncRefresh')
-    },
-
-    methods: {
-
-      // 初始化当前选中的标签
-      initCurTab(options) {
-        const app = this
-        if (options.dataType) {
-          const index = app.tabs.findIndex(item => item.value == options.dataType)
-          app.curTab = index > -1 ? index : 0
-        }
-      },
-
-      /**
-       * 上拉加载的回调 (页面初始化时也会执行一次)
-       * 其中page.num:当前页 从1开始, page.size:每页数据条数,默认10
-       * @param {Object} page
-       */
-      upCallback(page) {
-        const app = this
-        // 设置列表数据
-        app.getOrderList(page.num)
-          .then(list => {
-            const curPageLen = list.data.length
-            const totalSize = list.data.total
-            app.mescroll.endBySize(curPageLen, totalSize)
-          })
-          .catch(() => app.mescroll.endErr())
-      },
-
-      // 获取订单列表
-      getOrderList(pageNo = 1) {
-        const app = this
-        return new Promise((resolve, reject) => {
-          OrderApi.list({ dataType: app.getTabValue(), page: pageNo }, { load: false })
-            .then(result => {
-              // 合并新数据
-              const newList = app.initList(result.data.list)
-              app.list.data = getMoreListData(newList, app.list, pageNo)
-              resolve(newList)
-            })
-        })
-      },
-
-      // 初始化订单列表数据
-      initList(newList) {
-        newList.data.forEach(item => {
-          item.total_num = 0
-          item.goods.forEach(goods => {
-            item.total_num += goods.total_num
-          })
-        })
-        return newList
-      },
-
-      // 获取当前标签项的值
-      getTabValue() {
-        return this.tabs[this.curTab].value
-      },
-
-      // 切换标签项
-      onChangeTab(index) {
-        const app = this
-        // 设置当前选中的标签
-        app.curTab = index
-        // 刷新订单列表
-        app.onRefreshList()
-      },
-
-      // 刷新订单列表
-      onRefreshList() {
-        this.list = getEmptyPaginateObj()
-        setTimeout(() => {
-          this.mescroll.resetUpScroll()
-        }, 120)
-      },
-
-      // 取消订单
-      onCancel(orderId) {
-        const app = this
-        uni.showModal({
-          title: '友情提示',
-          content: '确认要取消该订单吗？',
-          success(o) {
-            if (o.confirm) {
-              OrderApi.cancel(orderId)
-                .then(result => {
-                  // 显示成功信息
-                  app.$toast(result.message)
-                  // 刷新订单列表
-                  app.onRefreshList()
-                })
-            }
-          }
-        });
-      },
-
-      // 确认收货
-      onReceipt(orderId) {
-        const app = this
-        uni.showModal({
-          title: '友情提示',
-          content: '确认收到商品了吗？',
-          success(o) {
-            if (o.confirm) {
-              OrderApi.receipt(orderId)
-                .then(result => {
-                  // 显示成功信息
-                  app.$success(result.message)
-                  // 刷新订单列表
-                  app.onRefreshList()
-                })
-            }
-          }
-        });
-      },
-
-      // 获取核销二维码
-      onExtractQRCode(orderId) {
-        const app = this
-        OrderApi.extractQrcode(orderId, { channel: app.platform })
-          .then(result => {
-            app.qrcodeImage = result.data.qrcode
-            app.showQRCodePopup = true
-          })
-      },
-
-      // 点击去支付
-      onPay(orderId) {
-        this.$navTo('pages/checkout/cashier/index', { orderId })
-      },
-
-      // 跳转到订单详情页
-      handleTargetDetail(orderId) {
-        this.$navTo('pages/order/detail', { orderId })
-      },
-
-      // 跳转到订单评价页
-      handleTargetComment(orderId) {
-        this.$navTo('pages/order/comment/index', { orderId })
-      }
-
-    },
-
-  }
-</script>
-
-<style lang="scss" scoped>
-  // 项目内容
-  .order-item {
-    margin: 20rpx auto 20rpx auto;
-    padding: 30rpx 30rpx;
-    width: 94%;
-    box-shadow: 0 1rpx 5rpx 0px rgba(0, 0, 0, 0.05);
-    border-radius: 16rpx;
-    background: #fff;
-  }
-
-  // 项目顶部
-  .item-top {
-    display: flex;
-    justify-content: space-between;
-    font-size: 26rpx;
-    margin-bottom: 40rpx;
-
-    .order-time {
-      color: #777;
-    }
-
-    .state-text {
-      color: $main-bg;
-    }
-  }
-
-  // 商品列表
-  .goods-list {
-
-    // 商品项
-    .goods-item {
-      display: flex;
-      margin-bottom: 40rpx;
-
-      // 商品图片
-      .goods-image {
-        width: 180rpx;
-        height: 180rpx;
-
-        .image {
-          display: block;
-          width: 100%;
-          height: 100%;
-          border-radius: 8rpx;
-        }
-      }
-
-      // 商品内容
-      .goods-content {
-        flex: 1;
-        padding-left: 16rpx;
-        padding-top: 16rpx;
-
-        .goods-title {
-          font-size: 26rpx;
-          max-height: 76rpx;
-        }
-
-        .goods-props {
-          margin-top: 14rpx;
-          height: 40rpx;
-          color: #ababab;
-          font-size: 24rpx;
-          overflow: hidden;
-
-          .goods-props-item {
-            display: inline-block;
-            margin-right: 14rpx;
-            padding: 4rpx 16rpx;
-            border-radius: 12rpx;
-            background-color: #F5F5F5;
-            width: auto;
-          }
-        }
-
-
-      }
-
-      // 交易信息
-      .goods-trade {
-        padding-top: 16rpx;
-        width: 150rpx;
-        text-align: right;
-        color: $uni-text-color-grey;
-        font-size: 26rpx;
-
-        .goods-price {
-          vertical-align: bottom;
-          margin-bottom: 16rpx;
-
-          .unit {
-            margin-right: -2rpx;
-            font-size: 24rpx;
-          }
-        }
-      }
-
-    }
-
-  }
-
-  // 订单合计
-  .order-total {
-    font-size: 26rpx;
-    vertical-align: bottom;
-    text-align: right;
-    height: 40rpx;
-    margin-bottom: 30rpx;
-
-    .unit {
-      margin-left: 8rpx;
-      margin-right: -2rpx;
-      font-size: 26rpx;
-    }
-
-    .money {
-      font-size: 28rpx;
-    }
-  }
-
-  // 订单操作
-  .order-handle {
-    .btn-group {
-
-      .btn-item {
-        border-radius: 10rpx;
-        padding: 8rpx 20rpx;
-        margin-left: 15rpx;
-        font-size: 26rpx;
-        float: right;
-        color: #383838;
-        border: 1rpx solid #a8a8a8;
-
-        &:last-child {
-          margin-left: 0;
-        }
-
-        &.active {
-          color: $main-bg;
-          border: 1rpx solid $main-bg;
-        }
-      }
-
-    }
-
-  }
-
-  // 弹出层 - 核销二维码
-  .qrcode-popup {
-    padding: 36rpx 30rpx;
-
-    .title {
-      font-size: 30rpx;
-      margin-bottom: 26rpx;
-      font-weight: bold;
-      text-align: center;
-    }
-
-    .pop-content {
-      min-height: 260rpx;
-      padding: 0 10rpx;
-
-      .image {
-        display: block;
-        width: 510rpx;
-        height: 510rpx;
-      }
-
-    }
-  }
-</style>
diff --git a/static/test/JD.png b/static/test/JD.png
deleted file mode 100644
index d72fbba6c8a4012d57df72be26f69600063d1751..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 960
zcmV;x13&zUP)<h;3K|Lk000e1NJLTq001HY000{Z1^@s688Tg`00001b5ch_0Itp)
z=>Px&dPzh<R7gwBmrZCCXBfx-&pVqKUDuX0xD!7PA`%puOG-X=W;U^)f*w2-q~4Su
zh2p`37f~Yg)KW@M1@TxBMZC2YtF3l+CW%o{K`ey|UXtAetsiln&F;L9ypx?U8+OOk
zrdi*^F3ddhJU{-=`|*DXF(Ypn{cR#KT9Q&l{grm?t}uMc$nIT5_^Hesm*N>14?(yB
z_RpnV_wPo*^gn|H=~a=GmcUEDa-rfC4{f+}r?|N8vVaI8v<Xp@o0*}snq!8nRc(&g
z?_2M>ccULH3y5Ug>U8bC+dVxkVe+l1RMIP#H)@Q}ndoqWM7mN1S|tRE<<gD~V`C4)
z_+<eBcr5MY24dTsF^>wO@533T6r7&(KG-%s{vvE&!|#_qS>Fz#icI!rw`&?ds7{-j
z1+Zd@sHzOmlxgm1gZM?QwpJnF$;!S?$N70hK|<*Z8S^5DJ`3QO|J2>w_NIX3cXuaK
zUi<8<?_-V7;FT&}O#x9#<TKU{A`B`3Np!MlAcc&1jEKISUq$?D^FaEn?zUEO&yx}a
zDl`pbvS+AcT@o{|d|yf8H4P-+-JMK*I6q-md_#-wobQbyGXvIOOG4b3w;24mX|0(y
zvtKduiTOo?OR*qR1J>Z`1?o6sw6wD(+M0rC-3Q}iWg!^&GG394b)ZGid3Ag<V?uZB
z-ue#h-+?@}EJHx#R9n_15_ta4leMuRg^YC(gz!u_qr15y%K<WNWG5K>Ni|n4?budB
zkjbH;j<r6|yp}R>Uqv6io$k$v{|ZtttWz4%X`dNMO~b6L^y|6YctenaVLbw{rFwin
z)gAkzXpd{n^U_)~ld*<L&>00$Eqr#pV-MHeN1hMtY4=3&HUV4IIiRRt`sGhM9q0FV
z1sMUv7lw7YRfzp_!IrM39HxG7?9C%Ua7CcJX&w@REuhT+cC`?h;T1t6g3tV2+Odx<
zwsBEK7<fd)BMdBfRv}3h*v5bfLRKkIwTbHQneP=hMcq6-F|)yY^`j&U#~MvT(f7Ye
zJNEH<UNQ=ziYVyCLy<%se1ZsN<_RQM@6@keeHD$Tf??I%kd(tNNttJ+gSz|2Z}lM5
zvn5`zg3pyDEJ^7RV>s>FKi11h`HXcv=n-)Vpa(1~SM<@*;91<rn`R$L`kH}Cqd1k5
ifqRg2O&_&mbG`u$F|~Q#P#i1(0000<MNUMnLSTaZeZyD)

diff --git a/static/test/address.png b/static/test/address.png
deleted file mode 100644
index 599023beb9ea1a9a005573248e3738978a05f3a6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1166
zcmV;91abR`P)<h;3K|Lk000e1NJLTq001rk001rs1^@s6SGg-U00001b5ch_0Itp)
z=>Px(NJ&INRA@u(m|bWbRTzffZ+4SL*q=5{P3FuND=1V{5bQ-nixv!xplDHO3cV2v
z7WASQ6)XzI3#sCT6)Gqy6jX?)7$Kmdl0uOxDkv@JMWnr$pWWuCaW@x9cjkP0Hc1WX
z&dxcTNuiLvTA1&=?=$awbAE<!gZ}6S<;Dj1^?q_2iEkvXnLz5Ta=EW>M;6&z*rLsf
z!HVQuoua?Dl*<=2nY7AM0iUz&y^^dU0FMIH)7+V-0E}5IM{+^%trlI2qBVif+1vL@
zk|zM#X#&FF-!l=8<|^I~CgWDtwgr9x=<2qew}|L)yT)o911D#E_k~-5c~c!@a0R{9
zE`15Yps88Ydd4@?fxFKX-Wa@UJ0F4QU@Fi{A}o2NSoRK>Xc~dngxJrpMobKJYb}lr
z=7Qi8-Fj{Cr53pWLSHL!24*4gu|<5Ii9%-HMW82=#sTb3``+!kEu#%y72+Ad`k)mw
zF`t+Uyko1))lK)<&T%F>(lXIV9x7D)4|P&E0C&y+^gygA%hwBmf2@^hRg~TYa5P>6
zrwf6*CpGX(+qUJpvYnSflx-%;%ok?@?~bI$JPu^<6{SA`+}3=C;V>WElp{<mB*AMX
zK5N^%EXw>6Cq~RK=L7GxBr|orCd4ZYYdEf!BfhU#@qS9u(gLsbiv664pH0GuAM37o
zV@YP}`aiZkNR;_HHiSqH<tzTDNm_c~w(~3#y&EScBRR0S;(woHrmoKl@vsH!yI623
zpU;>5capU9z=e2@VV#V9yo@8oz<oQ(Y^haRY7z6{eBiy8q@@RLm!4$8=V{CaRpFck
zs6YOF!BhFb{UR0cncnSpWix!P<s7cjn>s6R7}f9Yu2jya0=_tnIYInhyJ0gA$f1Jo
zf7Q&iD#YVh+%9y*wj3~9^xZ8<(CWHYtEj@ND7_EhP@*Vfl%yPyvi=*%jx2Rrcd{C%
zwVUKq1>bu*(Zd9My4UIN$k16G(RORBknhP|^8U~nubp@!b-OeU!b3X3#x;!5Lg4Px
z9cKhSCB)87rgL#izpiPMx_K+)e%-W<dVJZeYK!9_>%}!dUNe-W9L|^hS4}jH5?8{F
z8OC<TK`nNQCIrl<rvvYiqz&3?Nn>y&Fx~BxvYT**h<2DTuC7(P%5VX@x6XL3sZLwq
z%4D(ME%matJQ2kLG0GfbcX864FokZb$5)zEg}5J}(S(KR8m`9iE~*a}E0v$yfnGEC
z)#Mj<dnHW>_X^}dkMIAbS>Lp*?N(W-roI<utgM1>ezN($cp{SFKpNi>Qvp|8>Ug&)
z+wmEZ)$~IVgU1%?R}S1fIXSnMq?gC02EHs<vz?b17{0nlF^B(|4F4K<Z|niWG@w)I
z@n#^kzP<+~WlmA!aNXE3{+Jf<x+T6WtQIQuKh2a^-hAq<l6JCjdK=)^E9rIb@%6ru
gjaFIjgjehT3%TTUKD^1~lK=n!07*qoM6N<$g3yONYybcN

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

literal 1608
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
GLSTZlLHTq5

diff --git a/static/test/moments.png b/static/test/moments.png
deleted file mode 100644
index 1a91a4727b95b0c97d341fac8731ecdb51059f0a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2040
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
WrL$h&3EN=+0000<MNUMnLSTaFsMc5j

diff --git a/static/test/redShen.png b/static/test/redShen.png
deleted file mode 100644
index b7c586897b92e07334b5995c5715635a0ca0c21d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1350
zcmV-M1-bf(P)<h;3K|Lk000e1NJLTq000~S000~a1^@s6at+^<00001b5ch_0Itp)
z=>Px)07*naR7gv;R$pk7R}}x9o3A#NG)X%%^ZgN0=!1j8D&5!~CMX+h!-o|dtV4&6
z33IH&4t?0mU=M={Q*^9?V}cVV>%g%NHc*%-=!0W(R_K@yLLJMOFR|4&Y1Gz!-#zo*
zB$~#wiNfy7cfWhjJ->U-@0@cF;SomhN&9JOU<jZAX7-72Lijisx$a(WRt+^0JOdcd
zSk`7{u@i(1N}idE>PtkC(s{lB@ZKAl%&9J5ZaJL~0Zt$l?o8ZrglOqwftNtk56~*D
z7Ptz=u)I?|rv61+WE%*B1ay~hc?#fBlK6E2!C#kixhoq1zxo2CEa<bG-OQ|%r-(TP
zBICXgvk$^a!E*R_&pTbKK*{Bk_9hSwQpp41>az@_33P>llYe^YLsYPw&jIXta0^a@
z=_)hELAY?MC{J0lnW;vuSNqfPcwDqaHi7Z{J$`#Y+H$9ImVsf)TlOqKz8~<bg<Q*6
z7p^VKK{LSBGS?G{$O^+)OC-)H9AzOh^R<}gb~U4{Xs&sgfmf95-FdnHiJNY^nR9v5
zo*+fpqXN#F&SoZ@&>)hxN3*UDphlx1;FM*pT>(0$B2=dV(V}Rp1)x%}gc+C#f`#>+
zx!icQOhdqF%jyq7{8%z1csA~Ne=KLkv~Bl>m@buMs6U$d_ov4O42aitxbB#a#Dv`&
zGU$Ms2R?t;F<D-38ql;C0A!<{yQca^DnEPUsR*~s_Xx%ulh7^=wQwIGj+A8Oj$nZ<
zYMWRZk`Sha*732KYsK1p)h-1bDwvK3LOhyDx7E6=XgXUY;oH(W{|r_<avVgu#DV!N
zKr;*(CK5Vw338x4lli_@SHW`bs7gcy(>@2H7g{(-wRzq@)q+LS*(C`F)mk)@)@87o
zt7=!PXjl7!F%<FAUsUUvP9{?!VN8JeJmoFtO9BRo@p`+L{^9=soVBbs7-EDahN)m#
zuK{8d;BTTC_wA(sRdFb}jKUx!%W`S;OzCx^)KV4}Ec+-x+X2~6y8f+<Oz04}UF_<Z
znVG48R=YH~ZFFeb+U9!<3Y}APpM&*ur&Z@$Xr(`04{!nqcUq1IW@FyJYieE!mh&}$
z9gw^ynsxWr1AJT#^QN<l2nU(@aLjYx(}4Me(@h5d%|yj&D`!pnT_!qQ3P}D`5c!fh
zNklu#Ylj6<mRW{D;-gY}@XmJ6{YuTRClbl9(RxW`!ClC8t1_7@_aER{(>}mNLo9hD
zmUZ7$2b4Qjnf5lRc&iLXHwg@CK#5@xu2!}Lcy7vbk5yj%yk&oP?=2iqa<OdsgHjBX
zhk8cBEv>3Fb(55X?b*zs>Hw<Dr<2ZxkiZ%BA4qKM$fnQMlPe_c-4L`-1=~%}eX4Sa
zMJ>iH)9ec<bY2n6jQ&{G{iRk}K9T4aM)-XlWd7Wt*yQAW3oEj!10cevD)<~=LoAp6
zt+Mw}PqRpvgB>x?J6_L%rPd0zy$uq&^wqm`-L9>in<M4^WZ#WU`r}63Seft7R2%@9
zBgWR+Lb8a%+8Y;F+b_xxM)Z3K9t-){zEuC2U+p|c0!N_w81R$`Fc8VPr|WrP*}hcQ
zKnfjwP^>X(NbFr%=0tN2F$AKmS~>ICg?YTST-(vG5!QKXnp+5=eGf_+Pcb80X@pDt
zYVb)jd^ZJH$;r;7^$rmYFwjdxDw4;EdH7=1JzlS0t>@DJ0P2jI@lN3)(EtDd07*qo
IM6N<$g3z>t!2kdN

diff --git a/static/test/selectIcon.png b/static/test/selectIcon.png
deleted file mode 100644
index ab842bf3118c69c674582dd68c8b45435894444e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1127
zcmV-t1ep7YP)<h;3K|Lk000e1NJLTq001HY001Hg1^@s6I!6n_00001b5ch_0Itp)
z=>Px(AxT6*R9HvNmqBP8WfaGMZ#JnBL!E$94}vLFh>~O{P_cy`BBb=9V6jrcgT07)
zvS2}>5i3SesGuhmFZCc;tQfF|LM!G_P-!5uZP0*+=2%hOS&0yKlX=a2^JRA@JF~OX
zq|iMDGT+Saz4w3b{XgLz`N=)PL17SeC&~~`fgAva5gszZDE|P<h|Z(VB?%TPMS|=J
zM4=DYdl}JFAfr8fK=FZ334-&&@@n3hToBzo{xl^y2Qp$KUjyb4<_N<j&>B)&Lv;_r
zsL7P*A&>$4yiXXuF8^Ksts6{N5OvFMZM^U!gg%tOL<pZr;75OF{`7$-AEAHOYc_*}
zpsOg;5>!6PI+O{buJ_)Cg3iQI=|viiSLOfTZ{?-9{r?u|bA;z@cFsuPzn}JwR1lL1
zk+bH2=#2bZdAA6_)@Qc_bt)}09UxW{bEd{hW&}mS)GdF2$n-{u)(FExTQ!paQHBR_
z-CqzqlvxS<qeVa1RXc9^M?{_lU7}hU6NrQ#Cq7YA*Lwxw9Ow%5#^Xgbkq2!x^9O>9
zazX<C>nxB3n~fbQiMpPPuI-cB;{4_ZTYAw&saD21K-Bd-gay-T^~T=qW<%YH$3UZb
zGt7E;U{ezY4*s?yVL}2w8howN=ur7>Gc%Mc68MMn(%fAOZ4lAeuh$Q@2d1uf8DR?5
zW(PGjqOSKH!ZB25B)Ic-O=Kd1P@a*%UruOo$U6<ppj?o^e=(U6*Sm(WpHN?tTIGD=
zAj1Q_?2BF?%zS)s`~@860?NDu{!?2)Zkl?=5zIBkH8?&>zg#o>rCK|h1=K4<3^F!_
zQ@R{&YpMEs(?P=Z!&19(r4uAtVtOeJrU--qalJ`|pR+)0X~JVtyZ(KmG`q`3C@~vv
z)Fez%h&UtV<2dqdR%v3f!n9QV4?Ffn3JmVho@R??2s5p_+QxmFSnZ<g(!SabqeSJ~
zXLMBn!j>j(U-TWRRzBXUk$9j*O9>v%@*D}6INa10&6+c2%<t;IX_so}Kr^I6<r~Hd
z=4{<Im|JOcqWiG3K1cB-@F%i%ja_;K)ay@l8}oYq_@mtCtmL`1gy`dJ{0TDHed$Fe
zInK%m=tZekp4-l-?-0D}{b1Z$WUPbWVEar;H%5+g)hwkQaAzr7ca?RW>}rf!huW;-
z4!E>tyBZ<37F~PBdNj|>(x|^t)Ed|h`3fReW-ejH%yTj`%-D&#g34JM^)K^)tmk+W
z;pD~@BywYGW@g;Ub)pFqU9cSI3*+44uvSsI3i>O`A|ijGVaa^ZaYj%kHx^{HOZx2d
zORVdOZC$XMFtMpV4xDTO<@J*;nhXa1H|-`l>s0QQGo=MRRF5FC-(146mvHPQJjxXE
t)20Q?!%ZD%y&k$7&lS$d-GGSRc^mdDAVEkk&_w_M002ovPDHLkV1iq-6LJ6m

diff --git a/static/test/sheng.png b/static/test/sheng.png
deleted file mode 100644
index ad62734854075f532e8af7e0629cc1b03b61567f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 958
zcmV;v13~<WP)<h;3K|Lk000e1NJLTq001Tc001Tk1^@s6s6FYf00001b5ch_0Itp)
z=>Px&cu7P-R9Hvtm(Pn6XBfvn&m^vktB}G%Em(}Wmi$;ySiw{$l2SoIL7_c(^Uy=-
ztwKxv4@7!tZ#{Sr6l&=~1#eZlZPFHT#r2SE(3a+~=pGijrL}HpGEbdZcgaj<%)FTh
zi<nDb=6#>{GtcvVe!Rj9_-VG1VXX5<kLixSBhA`$oFgU9qV6@CKkxx!9rNu|xh!)(
zezW?_1WXGDKLkDEx5s&NuwwZEFcJ75Tk6%H1_LV}N4V;@r`L_ZG-pqdl9|BQEz(H6
zAxyUi0?Y2nuxZO9gwZa$Z8NY!`E!I%0$^WBqxz9A+=d#{qWvw%``tETgK4%h%2?-j
zV5=WYOVX&_N(7cKAI0MOU|@w%Ei|QG%Lfz4MEvevrIM!5d4P~zwH4oE1^YWh4*4J)
z{aEH|UnT|f;BuubmX$FA)1ti_WHtb>#N)qqNNaX!7+`CO^VZZj>CwZnJf_9+*TBgD
zz!y@lo(`*nCZSvjV|xlXf^ZCE50H)rR<O?^(w)wr%jcwVd%+ZpX1YeMy&H=PLIuPI
z)<S3$O5^SjRW8t35VtsQj<l&PBYGp2$NGV(TO>D*O^~*><7f_xNswUZpJT=Yp2q3i
z;K{?A(rPXD1=B+LU4#tkj3bf(aqHMt&}aX$?YSQ4$qdgUZuh8xGsA!X{vh}7EC!eL
z2P>AfpT{EJyDh4P>aR~lJ%ef!)qBj1G*{b~X0xM^@oSf*<#-+o1M_si66gZT0wN2j
zwy<;_wdSGy8}*H??*8f3s-167FtT9^OG~Jh5ZUWyVDE?N<rp5@{~o0N#&Q0{au#{~
zWHGFE`C8KCzSnWmyAXDw)+C}ikjb#@i+Dy~FyDds{oAopdvPR#IBtrMdzx$i^J$n)
z;z+=&_^AzdgMemW#e=6nF9Z&pmwNThI1o{5v}k|-G%G6uHE~ZPVPHy28r2=^4-DEU
z^GU$G^5Y*A4K)@X%7jee+lQesZ^}qSH@5jAi0^_k6fmh*UrPd}h4K}I6T=lhtXq#I
zaaQEsVT95h+FOa}#4XhRQD`V&Qm-1>=@~d)kj7ZIU})!rG=9D|NI2DP_&VZVbbR+!
zqY!BRKnctGB?6%5wiFZ89kY8zA0x1perbOOawckAi3t<EY-QHFWDJ)0;FtzpfyH#x
g+Ok(3ducrOKlvw))6|ba;s5{u07*qoM6N<$f?UhbDF6Tf

diff --git a/static/test/shenhe.png b/static/test/shenhe.png
deleted file mode 100644
index b2d0ac72913e39f3e291df217318f19b53d19836..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1279
zcmV<b1OWSqP)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ00001b5ch_0Itp)
z=>Px(xk*GpR9Hu~m|@7CQy9np|MI~HA1EIvLWmE_Rx66K)r2T3ibAHgtV||bRw&{F
zv22-G$b_1#Oe~X?DMD5zJ}6|X6=lT-A68bE`}erc(|PXqzMtoQU+=DZ>+L@0T<3qT
z>wo^&bsp<~SVUYSX``f->1Lm#mu-K%P`94%!iYFs(k+rUOS-6M{UJ#^CGD_%d_H>&
z1{4vOOS)6i8cBdE_7_o+bV`n&)fxlXF56!Z0X7FvMBo^w7dDPAm2{<~<;{uDZ#g_D
zX}hGiZJ%H)B2JZbo1_hrmbB&{mb70I(fdKt5!-y5uo0k$xFWd#0MdZtE@R_el3um_
z*|ZZ!1P6Jb0kCR{KhpWLq#q?cM--jJgp7S4IK}5pq?ohUHYplx$+?>|%2!X}9pG*P
z(3hDOHrg!-03iMa^tS&Vy!(KO5pi0Af)dbxtPsUB8$bsE^iL9UgY9htd@lNwh#<9F
zC7l3J<PNKCzcJt4BI3;^|C}1zvp^qrr%Y%u0DV#k<9^%MF5pnZ0p(SGwz*m7^lWrl
zMO26h`Md0QNt?Pj84>dWbZ-hDn;dIy<J07NU=+}_M=K#+XM0C`?R)_h!r|wT?WF_3
zjHX4zx0OhCUYtb*6cJCN9~G&er~xkoP`UQ&ZNJzNPV}Mh=eTV&YHShldZS&d^TSTt
z_q4{*nIgJJZIkv1i-<yt(Y600MQO9`XS&jn#C|VpTzd*&0gWN9bLvwH?b<$(jfjVn
zo5uiDa=hL4{XKw4$p_V@B_e#H`j?b_NS(`h5SmI~G-`$I13ms<XfDipiY|aSInsTg
zDVQsI7BJ2{>~JG~7nFGs@qAWyK5e!AU^Vt@)g?>=^l8?*-2i%|DIHHW)t;JlMrkEl
zJUD59vfcSJBe@ws^g1BKmUp!k5m5sIcuC7>O?9p5b?UT`+S1H*Mkpe#%5LJn{SzU?
zX5mE0tI)Rr(G?V1)^rJ|HO3A6sv5g>7Kf^ob0N+y4caS7PClO7z74GiEgFaN_WqW^
z7)eF}#3{eYlg&}nlL)A;0!wUvH}0vM&ap5Z;kvl)3|oL0zoDvU4`p-DdESz=rApaH
zm3B>VC>yn(a(sNlYe4kXCI1tO8xaT}fV(O_I)mn5RQs-H&rwML8mn|fyd-H|t{X*%
z|0iA@5mC6r*s7+GzF%MeuK#D1j-E9)N<u_29t>;Cyfz?i+V>d=2)@iVy>+k67f{n-
z(o6G%VlT?f(wZJ!?=n({mQWB`fHocJLzH#s`W)ZaR}UF)z@L}CY3@nw%BI8oqW0bS
za*c>PlAz3;32IhaJHYVicH8f?*Y-Z8tCs+4ASDhaPBR2Zf+6aNX}J^|ZP&MP>}u-U
zzG+SF%jXHVh!EpwPR}%hW5@!v5(?1zqI11IX8zdFJS4Bn)0H*?eytfm_Dizn@mj^G
zfkb)lv;)iplp%+N?{e$X8PVbwk1e)I=hz~Gw9rA&Cl!4{-|n)_JASGS0+gT#Ia2?4
z)sg~?i1Ekf{J_ACtA&zR$F{DvrVH6%KxJ`6@KX&fCn`JbR}#v|W9<koT7=q;5*QJq
pedQ+{qC!gcG#$fhL(<a)?q6q~H#n4?*9HIp002ovPDHLkV1iLVUYh^_

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

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

diff --git a/static/test/zhuan.png b/static/test/zhuan.png
deleted file mode 100644
index e8fe99617bd9514b51d084b94b5236149d89a0d6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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

diff --git a/utils/qqmap-wx-jssdk.min.js b/utils/qqmap-wx-jssdk.min.js
deleted file mode 100644
index 8fa1477..0000000
--- a/utils/qqmap-wx-jssdk.min.js
+++ /dev/null
@@ -1 +0,0 @@
-var ERROR_CONF = { KEY_ERR: 311, KEY_ERR_MSG: 'key格式错误', PARAM_ERR: 310, PARAM_ERR_MSG: '请求参数信息有误', SYSTEM_ERR: 600, SYSTEM_ERR_MSG: '系统错误', WX_ERR_CODE: 1000, WX_OK_CODE: 200 }; var BASE_URL = 'https://apis.map.qq.com/ws/'; var URL_SEARCH = BASE_URL + 'place/v1/search'; var URL_SUGGESTION = BASE_URL + 'place/v1/suggestion'; var URL_GET_GEOCODER = BASE_URL + 'geocoder/v1/'; var URL_CITY_LIST = BASE_URL + 'district/v1/list'; var URL_AREA_LIST = BASE_URL + 'district/v1/getchildren'; var URL_DISTANCE = BASE_URL + 'distance/v1/'; var URL_DIRECTION = BASE_URL + 'direction/v1/'; var MODE = { driving: 'driving', transit: 'transit' }; var EARTH_RADIUS = 6378136.49; var Utils = { safeAdd(x, y) { var lsw = (x & 0xffff) + (y & 0xffff); var msw = (x >> 16) + (y >> 16) + (lsw >> 16); return (msw << 16) | (lsw & 0xffff) }, bitRotateLeft(num, cnt) { return (num << cnt) | (num >>> (32 - cnt)) }, md5cmn(q, a, b, x, s, t) { return this.safeAdd(this.bitRotateLeft(this.safeAdd(this.safeAdd(a, q), this.safeAdd(x, t)), s), b) }, md5ff(a, b, c, d, x, s, t) { return this.md5cmn((b & c) | (~b & d), a, b, x, s, t) }, md5gg(a, b, c, d, x, s, t) { return this.md5cmn((b & d) | (c & ~d), a, b, x, s, t) }, md5hh(a, b, c, d, x, s, t) { return this.md5cmn(b ^ c ^ d, a, b, x, s, t) }, md5ii(a, b, c, d, x, s, t) { return this.md5cmn(c ^ (b | ~d), a, b, x, s, t) }, binlMD5(x, len) { x[len >> 5] |= 0x80 << (len % 32); x[((len + 64) >>> 9 << 4) + 14] = len; var i; var olda; var oldb; var oldc; var oldd; var a = 1732584193; var b = -271733879; var c = -1732584194; var d = 271733878; for (i = 0; i < x.length; i += 16) { olda = a; oldb = b; oldc = c; oldd = d; a = this.md5ff(a, b, c, d, x[i], 7, -680876936); d = this.md5ff(d, a, b, c, x[i + 1], 12, -389564586); c = this.md5ff(c, d, a, b, x[i + 2], 17, 606105819); b = this.md5ff(b, c, d, a, x[i + 3], 22, -1044525330); a = this.md5ff(a, b, c, d, x[i + 4], 7, -176418897); d = this.md5ff(d, a, b, c, x[i + 5], 12, 1200080426); c = this.md5ff(c, d, a, b, x[i + 6], 17, -1473231341); b = this.md5ff(b, c, d, a, x[i + 7], 22, -45705983); a = this.md5ff(a, b, c, d, x[i + 8], 7, 1770035416); d = this.md5ff(d, a, b, c, x[i + 9], 12, -1958414417); c = this.md5ff(c, d, a, b, x[i + 10], 17, -42063); b = this.md5ff(b, c, d, a, x[i + 11], 22, -1990404162); a = this.md5ff(a, b, c, d, x[i + 12], 7, 1804603682); d = this.md5ff(d, a, b, c, x[i + 13], 12, -40341101); c = this.md5ff(c, d, a, b, x[i + 14], 17, -1502002290); b = this.md5ff(b, c, d, a, x[i + 15], 22, 1236535329); a = this.md5gg(a, b, c, d, x[i + 1], 5, -165796510); d = this.md5gg(d, a, b, c, x[i + 6], 9, -1069501632); c = this.md5gg(c, d, a, b, x[i + 11], 14, 643717713); b = this.md5gg(b, c, d, a, x[i], 20, -373897302); a = this.md5gg(a, b, c, d, x[i + 5], 5, -701558691); d = this.md5gg(d, a, b, c, x[i + 10], 9, 38016083); c = this.md5gg(c, d, a, b, x[i + 15], 14, -660478335); b = this.md5gg(b, c, d, a, x[i + 4], 20, -405537848); a = this.md5gg(a, b, c, d, x[i + 9], 5, 568446438); d = this.md5gg(d, a, b, c, x[i + 14], 9, -1019803690); c = this.md5gg(c, d, a, b, x[i + 3], 14, -187363961); b = this.md5gg(b, c, d, a, x[i + 8], 20, 1163531501); a = this.md5gg(a, b, c, d, x[i + 13], 5, -1444681467); d = this.md5gg(d, a, b, c, x[i + 2], 9, -51403784); c = this.md5gg(c, d, a, b, x[i + 7], 14, 1735328473); b = this.md5gg(b, c, d, a, x[i + 12], 20, -1926607734); a = this.md5hh(a, b, c, d, x[i + 5], 4, -378558); d = this.md5hh(d, a, b, c, x[i + 8], 11, -2022574463); c = this.md5hh(c, d, a, b, x[i + 11], 16, 1839030562); b = this.md5hh(b, c, d, a, x[i + 14], 23, -35309556); a = this.md5hh(a, b, c, d, x[i + 1], 4, -1530992060); d = this.md5hh(d, a, b, c, x[i + 4], 11, 1272893353); c = this.md5hh(c, d, a, b, x[i + 7], 16, -155497632); b = this.md5hh(b, c, d, a, x[i + 10], 23, -1094730640); a = this.md5hh(a, b, c, d, x[i + 13], 4, 681279174); d = this.md5hh(d, a, b, c, x[i], 11, -358537222); c = this.md5hh(c, d, a, b, x[i + 3], 16, -722521979); b = this.md5hh(b, c, d, a, x[i + 6], 23, 76029189); a = this.md5hh(a, b, c, d, x[i + 9], 4, -640364487); d = this.md5hh(d, a, b, c, x[i + 12], 11, -421815835); c = this.md5hh(c, d, a, b, x[i + 15], 16, 530742520); b = this.md5hh(b, c, d, a, x[i + 2], 23, -995338651); a = this.md5ii(a, b, c, d, x[i], 6, -198630844); d = this.md5ii(d, a, b, c, x[i + 7], 10, 1126891415); c = this.md5ii(c, d, a, b, x[i + 14], 15, -1416354905); b = this.md5ii(b, c, d, a, x[i + 5], 21, -57434055); a = this.md5ii(a, b, c, d, x[i + 12], 6, 1700485571); d = this.md5ii(d, a, b, c, x[i + 3], 10, -1894986606); c = this.md5ii(c, d, a, b, x[i + 10], 15, -1051523); b = this.md5ii(b, c, d, a, x[i + 1], 21, -2054922799); a = this.md5ii(a, b, c, d, x[i + 8], 6, 1873313359); d = this.md5ii(d, a, b, c, x[i + 15], 10, -30611744); c = this.md5ii(c, d, a, b, x[i + 6], 15, -1560198380); b = this.md5ii(b, c, d, a, x[i + 13], 21, 1309151649); a = this.md5ii(a, b, c, d, x[i + 4], 6, -145523070); d = this.md5ii(d, a, b, c, x[i + 11], 10, -1120210379); c = this.md5ii(c, d, a, b, x[i + 2], 15, 718787259); b = this.md5ii(b, c, d, a, x[i + 9], 21, -343485551); a = this.safeAdd(a, olda); b = this.safeAdd(b, oldb); c = this.safeAdd(c, oldc); d = this.safeAdd(d, oldd) } return [a, b, c, d] }, binl2rstr(input) { var i; var output = ''; var length32 = input.length * 32; for (i = 0; i < length32; i += 8) { output += String.fromCharCode((input[i >> 5] >>> (i % 32)) & 0xff) } return output }, rstr2binl(input) { var i; var output = []; output[(input.length >> 2) - 1] = undefined; for (i = 0; i < output.length; i += 1) { output[i] = 0 } var length8 = input.length * 8; for (i = 0; i < length8; i += 8) { output[i >> 5] |= (input.charCodeAt(i / 8) & 0xff) << (i % 32) } return output }, rstrMD5(s) { return this.binl2rstr(this.binlMD5(this.rstr2binl(s), s.length * 8)) }, rstrHMACMD5(key, data) { var i; var bkey = this.rstr2binl(key); var ipad = []; var opad = []; var hash; ipad[15] = opad[15] = undefined; if (bkey.length > 16) { bkey = this.binlMD5(bkey, key.length * 8) } for (i = 0; i < 16; i += 1) { ipad[i] = bkey[i] ^ 0x36363636; opad[i] = bkey[i] ^ 0x5c5c5c5c } hash = this.binlMD5(ipad.concat(this.rstr2binl(data)), 512 + data.length * 8); return this.binl2rstr(this.binlMD5(opad.concat(hash), 512 + 128)) }, rstr2hex(input) { var hexTab = '0123456789abcdef'; var output = ''; var x; var i; for (i = 0; i < input.length; i += 1) { x = input.charCodeAt(i); output += hexTab.charAt((x >>> 4) & 0x0f) + hexTab.charAt(x & 0x0f) } return output }, str2rstrUTF8(input) { return unescape(encodeURIComponent(input)) }, rawMD5(s) { return this.rstrMD5(this.str2rstrUTF8(s)) }, hexMD5(s) { return this.rstr2hex(this.rawMD5(s)) }, rawHMACMD5(k, d) { return this.rstrHMACMD5(this.str2rstrUTF8(k), str2rstrUTF8(d)) }, hexHMACMD5(k, d) { return this.rstr2hex(this.rawHMACMD5(k, d)) }, md5(string, key, raw) { if (!key) { if (!raw) { return this.hexMD5(string) } return this.rawMD5(string) } if (!raw) { return this.hexHMACMD5(key, string) } return this.rawHMACMD5(key, string) }, getSig(requestParam, sk, feature, mode) { var sig = null; var requestArr = []; Object.keys(requestParam).sort().forEach(function (key) { requestArr.push(key + '=' + requestParam[key]) }); if (feature == 'search') { sig = '/ws/place/v1/search?' + requestArr.join('&') + sk } if (feature == 'suggest') { sig = '/ws/place/v1/suggestion?' + requestArr.join('&') + sk } if (feature == 'reverseGeocoder') { sig = '/ws/geocoder/v1/?' + requestArr.join('&') + sk } if (feature == 'geocoder') { sig = '/ws/geocoder/v1/?' + requestArr.join('&') + sk } if (feature == 'getCityList') { sig = '/ws/district/v1/list?' + requestArr.join('&') + sk } if (feature == 'getDistrictByCityId') { sig = '/ws/district/v1/getchildren?' + requestArr.join('&') + sk } if (feature == 'calculateDistance') { sig = '/ws/distance/v1/?' + requestArr.join('&') + sk } if (feature == 'direction') { sig = '/ws/direction/v1/' + mode + '?' + requestArr.join('&') + sk } sig = this.md5(sig); return sig }, location2query(data) { if (typeof data == 'string') { return data } var query = ''; for (var i = 0; i < data.length; i++) { var d = data[i]; if (!!query) { query += ';' } if (d.location) { query = query + d.location.lat + ',' + d.location.lng } if (d.latitude && d.longitude) { query = query + d.latitude + ',' + d.longitude } } return query }, rad(d) { return d * Math.PI / 180.0 }, getEndLocation(location) { var to = location.split(';'); var endLocation = []; for (var i = 0; i < to.length; i++) { endLocation.push({ lat: parseFloat(to[i].split(',')[0]), lng: parseFloat(to[i].split(',')[1]) }) } return endLocation }, getDistance(latFrom, lngFrom, latTo, lngTo) { var radLatFrom = this.rad(latFrom); var radLatTo = this.rad(latTo); var a = radLatFrom - radLatTo; var b = this.rad(lngFrom) - this.rad(lngTo); var distance = 2 * Math.asin(Math.sqrt(Math.pow(Math.sin(a / 2), 2) + Math.cos(radLatFrom) * Math.cos(radLatTo) * Math.pow(Math.sin(b / 2), 2))); distance = distance * EARTH_RADIUS; distance = Math.round(distance * 10000) / 10000; return parseFloat(distance.toFixed(0)) }, getWXLocation(success, fail, complete) { wx.getLocation({ type: 'gcj02', success: success, fail: fail, complete: complete }) }, getLocationParam(location) { if (typeof location == 'string') { var locationArr = location.split(','); if (locationArr.length === 2) { location = { latitude: location.split(',')[0], longitude: location.split(',')[1] } } else { location = {} } } return location }, polyfillParam(param) { param.success = param.success || function () { }; param.fail = param.fail || function () { }; param.complete = param.complete || function () { } }, checkParamKeyEmpty(param, key) { if (!param[key]) { var errconf = this.buildErrorConfig(ERROR_CONF.PARAM_ERR, ERROR_CONF.PARAM_ERR_MSG + key + '参数格式有误'); param.fail(errconf); param.complete(errconf); return true } return false }, checkKeyword(param) { return !this.checkParamKeyEmpty(param, 'keyword') }, checkLocation(param) { var location = this.getLocationParam(param.location); if (!location || !location.latitude || !location.longitude) { var errconf = this.buildErrorConfig(ERROR_CONF.PARAM_ERR, ERROR_CONF.PARAM_ERR_MSG + ' location参数格式有误'); param.fail(errconf); param.complete(errconf); return false } return true }, buildErrorConfig(errCode, errMsg) { return { status: errCode, message: errMsg } }, handleData(param, data, feature) { if (feature == 'search') { var searchResult = data.data; var searchSimplify = []; for (var i = 0; i < searchResult.length; i++) { searchSimplify.push({ id: searchResult[i].id || null, title: searchResult[i].title || null, latitude: searchResult[i].location && searchResult[i].location.lat || null, longitude: searchResult[i].location && searchResult[i].location.lng || null, address: searchResult[i].address || null, category: searchResult[i].category || null, tel: searchResult[i].tel || null, adcode: searchResult[i].ad_info && searchResult[i].ad_info.adcode || null, city: searchResult[i].ad_info && searchResult[i].ad_info.city || null, district: searchResult[i].ad_info && searchResult[i].ad_info.district || null, province: searchResult[i].ad_info && searchResult[i].ad_info.province || null }) } param.success(data, { searchResult: searchResult, searchSimplify: searchSimplify }) } else if (feature == 'suggest') { var suggestResult = data.data; var suggestSimplify = []; for (var i = 0; i < suggestResult.length; i++) { suggestSimplify.push({ adcode: suggestResult[i].adcode || null, address: suggestResult[i].address || null, category: suggestResult[i].category || null, city: suggestResult[i].city || null, district: suggestResult[i].district || null, id: suggestResult[i].id || null, latitude: suggestResult[i].location && suggestResult[i].location.lat || null, longitude: suggestResult[i].location && suggestResult[i].location.lng || null, province: suggestResult[i].province || null, title: suggestResult[i].title || null, type: suggestResult[i].type || null }) } param.success(data, { suggestResult: suggestResult, suggestSimplify: suggestSimplify }) } else if (feature == 'reverseGeocoder') { var reverseGeocoderResult = data.result; var reverseGeocoderSimplify = { address: reverseGeocoderResult.address || null, latitude: reverseGeocoderResult.location && reverseGeocoderResult.location.lat || null, longitude: reverseGeocoderResult.location && reverseGeocoderResult.location.lng || null, adcode: reverseGeocoderResult.ad_info && reverseGeocoderResult.ad_info.adcode || null, city: reverseGeocoderResult.address_component && reverseGeocoderResult.address_component.city || null, district: reverseGeocoderResult.address_component && reverseGeocoderResult.address_component.district || null, nation: reverseGeocoderResult.address_component && reverseGeocoderResult.address_component.nation || null, province: reverseGeocoderResult.address_component && reverseGeocoderResult.address_component.province || null, street: reverseGeocoderResult.address_component && reverseGeocoderResult.address_component.street || null, street_number: reverseGeocoderResult.address_component && reverseGeocoderResult.address_component.street_number || null, recommend: reverseGeocoderResult.formatted_addresses && reverseGeocoderResult.formatted_addresses.recommend || null, rough: reverseGeocoderResult.formatted_addresses && reverseGeocoderResult.formatted_addresses.rough || null }; if (reverseGeocoderResult.pois) { var pois = reverseGeocoderResult.pois; var poisSimplify = []; for (var i = 0; i < pois.length; i++) { poisSimplify.push({ id: pois[i].id || null, title: pois[i].title || null, latitude: pois[i].location && pois[i].location.lat || null, longitude: pois[i].location && pois[i].location.lng || null, address: pois[i].address || null, category: pois[i].category || null, adcode: pois[i].ad_info && pois[i].ad_info.adcode || null, city: pois[i].ad_info && pois[i].ad_info.city || null, district: pois[i].ad_info && pois[i].ad_info.district || null, province: pois[i].ad_info && pois[i].ad_info.province || null }) } param.success(data, { reverseGeocoderResult: reverseGeocoderResult, reverseGeocoderSimplify: reverseGeocoderSimplify, pois: pois, poisSimplify: poisSimplify }) } else { param.success(data, { reverseGeocoderResult: reverseGeocoderResult, reverseGeocoderSimplify: reverseGeocoderSimplify }) } } else if (feature == 'geocoder') { var geocoderResult = data.result; var geocoderSimplify = { title: geocoderResult.title || null, latitude: geocoderResult.location && geocoderResult.location.lat || null, longitude: geocoderResult.location && geocoderResult.location.lng || null, adcode: geocoderResult.ad_info && geocoderResult.ad_info.adcode || null, province: geocoderResult.address_components && geocoderResult.address_components.province || null, city: geocoderResult.address_components && geocoderResult.address_components.city || null, district: geocoderResult.address_components && geocoderResult.address_components.district || null, street: geocoderResult.address_components && geocoderResult.address_components.street || null, street_number: geocoderResult.address_components && geocoderResult.address_components.street_number || null, level: geocoderResult.level || null }; param.success(data, { geocoderResult: geocoderResult, geocoderSimplify: geocoderSimplify }) } else if (feature == 'getCityList') { var provinceResult = data.result[0]; var cityResult = data.result[1]; var districtResult = data.result[2]; param.success(data, { provinceResult: provinceResult, cityResult: cityResult, districtResult: districtResult }) } else if (feature == 'getDistrictByCityId') { var districtByCity = data.result[0]; param.success(data, districtByCity) } else if (feature == 'calculateDistance') { var calculateDistanceResult = data.result.elements; var distance = []; for (var i = 0; i < calculateDistanceResult.length; i++) { distance.push(calculateDistanceResult[i].distance) } param.success(data, { calculateDistanceResult: calculateDistanceResult, distance: distance }) } else if (feature == 'direction') { var direction = data.result.routes; param.success(data, direction) } else { param.success(data) } }, buildWxRequestConfig(param, options, feature) { var that = this; options.header = { "content-type": "application/json" }; options.method = 'GET'; options.success = function (res) { var data = res.data; if (data.status === 0) { that.handleData(param, data, feature) } else { param.fail(data) } }; options.fail = function (res) { res.statusCode = ERROR_CONF.WX_ERR_CODE; param.fail(that.buildErrorConfig(ERROR_CONF.WX_ERR_CODE, res.errMsg)) }; options.complete = function (res) { var statusCode = +res.statusCode; switch (statusCode) { case ERROR_CONF.WX_ERR_CODE: { param.complete(that.buildErrorConfig(ERROR_CONF.WX_ERR_CODE, res.errMsg)); break } case ERROR_CONF.WX_OK_CODE: { var data = res.data; if (data.status === 0) { param.complete(data) } else { param.complete(that.buildErrorConfig(data.status, data.message)) } break } default: { param.complete(that.buildErrorConfig(ERROR_CONF.SYSTEM_ERR, ERROR_CONF.SYSTEM_ERR_MSG)) } } }; return options }, locationProcess(param, locationsuccess, locationfail, locationcomplete) { var that = this; locationfail = locationfail || function (res) { res.statusCode = ERROR_CONF.WX_ERR_CODE; param.fail(that.buildErrorConfig(ERROR_CONF.WX_ERR_CODE, res.errMsg)) }; locationcomplete = locationcomplete || function (res) { if (res.statusCode == ERROR_CONF.WX_ERR_CODE) { param.complete(that.buildErrorConfig(ERROR_CONF.WX_ERR_CODE, res.errMsg)) } }; if (!param.location) { that.getWXLocation(locationsuccess, locationfail, locationcomplete) } else if (that.checkLocation(param)) { var location = Utils.getLocationParam(param.location); locationsuccess(location) } } }; class QQMapWX { constructor(options) { if (!options.key) { throw Error('key值不能为空') } this.key = options.key }; search(options) { var that = this; options = options || {}; Utils.polyfillParam(options); if (!Utils.checkKeyword(options)) { return } var requestParam = { keyword: options.keyword, orderby: options.orderby || '_distance', page_size: options.page_size || 10, page_index: options.page_index || 1, output: 'json', key: that.key }; if (options.address_format) { requestParam.address_format = options.address_format } if (options.filter) { requestParam.filter = options.filter } var distance = options.distance || "1000"; var auto_extend = options.auto_extend || 1; var region = null; var rectangle = null; if (options.region) { region = options.region } if (options.rectangle) { rectangle = options.rectangle } var locationsuccess = function (result) { if (region && !rectangle) { requestParam.boundary = "region(" + region + "," + auto_extend + "," + result.latitude + "," + result.longitude + ")"; if (options.sig) { requestParam.sig = Utils.getSig(requestParam, options.sig, 'search') } } else if (rectangle && !region) { requestParam.boundary = "rectangle(" + rectangle + ")"; if (options.sig) { requestParam.sig = Utils.getSig(requestParam, options.sig, 'search') } } else { requestParam.boundary = "nearby(" + result.latitude + "," + result.longitude + "," + distance + "," + auto_extend + ")"; if (options.sig) { requestParam.sig = Utils.getSig(requestParam, options.sig, 'search') } } wx.request(Utils.buildWxRequestConfig(options, { url: URL_SEARCH, data: requestParam }, 'search')) }; Utils.locationProcess(options, locationsuccess) }; getSuggestion(options) { var that = this; options = options || {}; Utils.polyfillParam(options); if (!Utils.checkKeyword(options)) { return } var requestParam = { keyword: options.keyword, region: options.region || '全国', region_fix: options.region_fix || 0, policy: options.policy || 0, page_size: options.page_size || 10, page_index: options.page_index || 1, get_subpois: options.get_subpois || 0, output: 'json', key: that.key }; if (options.address_format) { requestParam.address_format = options.address_format } if (options.filter) { requestParam.filter = options.filter } if (options.location) { var locationsuccess = function (result) { requestParam.location = result.latitude + ',' + result.longitude; if (options.sig) { requestParam.sig = Utils.getSig(requestParam, options.sig, 'suggest') } wx.request(Utils.buildWxRequestConfig(options, { url: URL_SUGGESTION, data: requestParam }, "suggest")) }; Utils.locationProcess(options, locationsuccess) } else { if (options.sig) { requestParam.sig = Utils.getSig(requestParam, options.sig, 'suggest') } wx.request(Utils.buildWxRequestConfig(options, { url: URL_SUGGESTION, data: requestParam }, "suggest")) } }; reverseGeocoder(options) { var that = this; options = options || {}; Utils.polyfillParam(options); var requestParam = { coord_type: options.coord_type || 5, get_poi: options.get_poi || 0, output: 'json', key: that.key }; if (options.poi_options) { requestParam.poi_options = options.poi_options } var locationsuccess = function (result) { requestParam.location = result.latitude + ',' + result.longitude; if (options.sig) { requestParam.sig = Utils.getSig(requestParam, options.sig, 'reverseGeocoder') } wx.request(Utils.buildWxRequestConfig(options, { url: URL_GET_GEOCODER, data: requestParam }, 'reverseGeocoder')) }; Utils.locationProcess(options, locationsuccess) }; geocoder(options) { var that = this; options = options || {}; Utils.polyfillParam(options); if (Utils.checkParamKeyEmpty(options, 'address')) { return } var requestParam = { address: options.address, output: 'json', key: that.key }; if (options.region) { requestParam.region = options.region } if (options.sig) { requestParam.sig = Utils.getSig(requestParam, options.sig, 'geocoder') } wx.request(Utils.buildWxRequestConfig(options, { url: URL_GET_GEOCODER, data: requestParam }, 'geocoder')) }; getCityList(options) { var that = this; options = options || {}; Utils.polyfillParam(options); var requestParam = { output: 'json', key: that.key }; if (options.sig) { requestParam.sig = Utils.getSig(requestParam, options.sig, 'getCityList') } wx.request(Utils.buildWxRequestConfig(options, { url: URL_CITY_LIST, data: requestParam }, 'getCityList')) }; getDistrictByCityId(options) { var that = this; options = options || {}; Utils.polyfillParam(options); if (Utils.checkParamKeyEmpty(options, 'id')) { return } var requestParam = { id: options.id || '', output: 'json', key: that.key }; if (options.sig) { requestParam.sig = Utils.getSig(requestParam, options.sig, 'getDistrictByCityId') } wx.request(Utils.buildWxRequestConfig(options, { url: URL_AREA_LIST, data: requestParam }, 'getDistrictByCityId')) }; calculateDistance(options) { var that = this; options = options || {}; Utils.polyfillParam(options); if (Utils.checkParamKeyEmpty(options, 'to')) { return } var requestParam = { mode: options.mode || 'walking', to: Utils.location2query(options.to), output: 'json', key: that.key }; if (options.from) { options.location = options.from } if (requestParam.mode == 'straight') { var locationsuccess = function (result) { var locationTo = Utils.getEndLocation(requestParam.to); var data = { message: "query ok", result: { elements: [] }, status: 0 }; for (var i = 0; i < locationTo.length; i++) { data.result.elements.push({ distance: Utils.getDistance(result.latitude, result.longitude, locationTo[i].lat, locationTo[i].lng), duration: 0, from: { lat: result.latitude, lng: result.longitude }, to: { lat: locationTo[i].lat, lng: locationTo[i].lng } }) } var calculateResult = data.result.elements; var distanceResult = []; for (var i = 0; i < calculateResult.length; i++) { distanceResult.push(calculateResult[i].distance) } return options.success(data, { calculateResult: calculateResult, distanceResult: distanceResult }) }; Utils.locationProcess(options, locationsuccess) } else { var locationsuccess = function (result) { requestParam.from = result.latitude + ',' + result.longitude; if (options.sig) { requestParam.sig = Utils.getSig(requestParam, options.sig, 'calculateDistance') } wx.request(Utils.buildWxRequestConfig(options, { url: URL_DISTANCE, data: requestParam }, 'calculateDistance')) }; Utils.locationProcess(options, locationsuccess) } }; direction(options) { var that = this; options = options || {}; Utils.polyfillParam(options); if (Utils.checkParamKeyEmpty(options, 'to')) { return } var requestParam = { output: 'json', key: that.key }; if (typeof options.to == 'string') { requestParam.to = options.to } else { requestParam.to = options.to.latitude + ',' + options.to.longitude } var SET_URL_DIRECTION = null; options.mode = options.mode || MODE.driving; SET_URL_DIRECTION = URL_DIRECTION + options.mode; if (options.from) { options.location = options.from } if (options.mode == MODE.driving) { if (options.from_poi) { requestParam.from_poi = options.from_poi } if (options.heading) { requestParam.heading = options.heading } if (options.speed) { requestParam.speed = options.speed } if (options.accuracy) { requestParam.accuracy = options.accuracy } if (options.road_type) { requestParam.road_type = options.road_type } if (options.to_poi) { requestParam.to_poi = options.to_poi } if (options.from_track) { requestParam.from_track = options.from_track } if (options.waypoints) { requestParam.waypoints = options.waypoints } if (options.policy) { requestParam.policy = options.policy } if (options.plate_number) { requestParam.plate_number = options.plate_number } } if (options.mode == MODE.transit) { if (options.departure_time) { requestParam.departure_time = options.departure_time } if (options.policy) { requestParam.policy = options.policy } } var locationsuccess = function (result) { requestParam.from = result.latitude + ',' + result.longitude; if (options.sig) { requestParam.sig = Utils.getSig(requestParam, options.sig, 'direction', options.mode) } wx.request(Utils.buildWxRequestConfig(options, { url: SET_URL_DIRECTION, data: requestParam }, 'direction')) }; Utils.locationProcess(options, locationsuccess) } }; module.exports = QQMapWX;
\ No newline at end of file