From 44645dd0b7cc3cdc49e17732fa9e65f73d5d2d40 Mon Sep 17 00:00:00 2001
From: anhaogxs <704041637@qq.com>
Date: Sat, 20 Feb 2021 16:01:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=91=E5=AE=9A=E6=89=8B?=
 =?UTF-8?q?=E6=9C=BA=E5=8F=B7=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/user.js                       | 233 ++++++++--------
 components/Adv.vue                | 397 +++++++++++++--------------
 components/sh-adv.vue             | 439 ++++++++++++++----------------
 pages/home/components/Banner.vue  | 222 +++++++--------
 pages/home/index.vue              |  44 +--
 pages/user/BindingPhone/index.vue | 155 +++++------
 6 files changed, 732 insertions(+), 758 deletions(-)

diff --git a/api/user.js b/api/user.js
index ee3862d..a520d81 100644
--- a/api/user.js
+++ b/api/user.js
@@ -1,20 +1,20 @@
-import request from "@/utils/request";
+import request from '@/utils/request'
 
 /**
  * 省市区
  */
 export function getCity(data) {
-	return request.get("/city_list", data, {
-		// return request.get("/citys", data, {
-		login: false
-	});
+  return request.get('/city_list', data, {
+    // return request.get("/citys", data, {
+    login: false,
+  })
 }
 
 export function district(data) {
-	// return request.get("/city_list", data, {
-	return request.get("/citys", data, {
-		login: false
-	});
+  // return request.get("/city_list", data, {
+  return request.get('/citys', data, {
+    login: false,
+  })
 }
 
 /**
@@ -22,9 +22,9 @@ export function district(data) {
  * @param data object 用户账号密码
  */
 export function login(data) {
-	return request.post("/login", data, {
-		login: false
-	});
+  return request.post('/login', data, {
+    login: false,
+  })
 }
 
 /**
@@ -32,9 +32,9 @@ export function login(data) {
  * @param data object 用户手机号 也只能
  */
 export function loginMobile(data) {
-	return request.post("/login/mobile", data, {
-		login: false
-	});
+  return request.post('/login/mobile', data, {
+    login: false,
+  })
 }
 
 /**
@@ -42,9 +42,9 @@ export function loginMobile(data) {
  * @param data object 用户手机号
  */
 export function registerVerify(data) {
-	return request.post("/register/verify", data, {
-		login: false
-	});
+  return request.post('/register/verify', data, {
+    login: false,
+  })
 }
 
 /**
@@ -52,9 +52,9 @@ export function registerVerify(data) {
  * @param data object 用户手机号 验证码 密码
  */
 export function register(data) {
-	return request.post("/register", data, {
-		login: false
-	});
+  return request.post('/register', data, {
+    login: false,
+  })
 }
 
 /**
@@ -62,364 +62,375 @@ export function register(data) {
  * @param data object 用户手机号 验证码 密码
  */
 export function registerReset(data) {
-	return request.post("/register/reset", data, {
-		login: false
-	});
+  return request.post('/register/reset', data, {
+    login: false,
+  })
 }
 
 /*
  * 领取优惠券列表
  * */
 export function getCoupon(q) {
-	return request.get("/coupons", q, {
-		login: true
-	});
+  return request.get('/coupons', q, {
+    login: true,
+  })
 }
 
 /*
  * 点击领取优惠券
  * */
 export function getCouponReceive(id) {
-	return request.post("/coupon/receive", {
-		couponId: id
-	}, {
-		login: true
-	});
+  return request.post(
+    '/coupon/receive',
+    {
+      couponId: id,
+    },
+    {
+      login: true,
+    }
+  )
 }
 
 /*
  * 批量领取优惠券
  * */
 export function couponReceiveBatch(couponId) {
-	return request.post("/coupon/receive/batch", {
-		couponId
-	});
+  return request.post('/coupon/receive/batch', {
+    couponId,
+  })
 }
 
 /*
  * 我的优惠券
  * */
 export function getCouponsUser(type) {
-	return request.get("/coupons/user/" + type);
+  return request.get('/coupons/user/' + type)
 }
 
 /*
  * 个人中心
  * */
 export function getUser() {
-	return request.get("/user");
+  return request.get('/user')
 }
 
 /*
  * 用户信息
  * */
 export function getUserInfo() {
-
-	return request.get("/userinfo", {
-		login: true
-	});
+  return request.get('/userinfo', {
+    login: true,
+  })
 }
 
 /*
  * 小程序登陆
  * */
 export function wxappAuth(data) {
-
-	return request.post("/wxapp/auth", data, {
-		login: false
-	});
+  return request.post('/wxapp/auth', data, {
+    login: false,
+  })
 }
 
 /*
  * 个人中心(功能列表)
  * */
 export function getMenuUser() {
-	return request.get("/menu/user");
+  return request.get('/menu/user')
 }
 
 /*
  * 地址列表
  * */
 export function getAddressList(data) {
-	return request.get("/address/list", data || {});
+  return request.get('/address/list', data || {})
 }
 
 /*
  * 删除地址
  * */
 export function getAddressRemove(id) {
-	return request.post("/address/del", {
-		id: id
-	});
+  return request.post('/address/del', {
+    id: id,
+  })
 }
 
 /*
  * 设置默认地址
  * */
 export function getAddressDefaultSet(id) {
-	return request.post("/address/default/set", {
-		id: id
-	});
+  return request.post('/address/default/set', {
+    id: id,
+  })
 }
 
 /*
  * 获取默认地址
  * */
 export function getAddressDefault() {
-	return request.get("/address/default");
+  return request.get('/address/default')
 }
 
 /*
  * 获取单个地址
  * */
 export function getAddress(id) {
-	return request.get("/address/detail/" + id);
+  return request.get('/address/detail/' + id)
 }
 
 /*
  * 修改 添加地址
  * */
 export function postAddress(data) {
-	return request.post("/address/edit", data);
+  return request.post('/address/edit', data)
 }
 
 /*
  * 获取收藏产品
  * */
 export function getCollectUser(page, limit, type) {
-	return request.get("/collect/user", {
-		page: page,
-		limit: limit,
-		type
-	});
+  return request.get('/collect/user', {
+    page: page,
+    limit: limit,
+    type,
+  })
 }
 
 /*
  * 删除收藏产品
  * */
 export function getCollectDel(id, category) {
-	return request.post("/collect/del", {
-		id: id,
-		category: category
-	});
+  return request.post('/collect/del', {
+    id: id,
+    category: category,
+  })
 }
 
 /*
  * 批量收藏产品
  * */
 export function postCollectAll(data) {
-	return request.post("/collect/all", data);
+  return request.post('/collect/all', data)
 }
 
 /*
  * 添加收藏产品
  * */
 export function getCollectAdd(id, category) {
-	return request.post("collect/add", {
-		id: id,
-		category: category
-	});
+  return request.post('collect/add', {
+    id: id,
+    category: category,
+  })
 }
 
 /*
  * 签到配置
  * */
 export function getSignConfig() {
-	return request.get("/sign/config");
+  return request.get('/sign/config')
 }
 
 /*
  * 签到里的签到列表
  * */
 export function getSignList(page, limit) {
-	return request.get("/sign/list", {
-		page: page,
-		limit: limit
-	});
+  return request.get('/sign/list', {
+    page: page,
+    limit: limit,
+  })
 }
 
 /*
  * 签到列表
  * */
 export function getSignMonth(page, limit) {
-	return request.get("/sign/month", {
-		page: page,
-		limit: limit
-	});
+  return request.get('/sign/month', {
+    page: page,
+    limit: limit,
+  })
 }
 
 /*
  * 签到用户信息
  * */
 export function postSignUser(sign) {
-	return request.post("/sign/user", sign);
+  return request.post('/sign/user', sign)
 }
 
 /*
  * 签到
  * */
 export function postSignIntegral(sign) {
-	return request.post("/sign/integral", sign);
+  return request.post('/sign/integral', sign)
 }
 
 /*
  * 推广数据
  * */
 export function getSpreadInfo() {
-	return request.get("/commission");
+  return request.get('/commission')
 }
 
 /*
  * 推广人列表
  * */
 export function getSpreadUser(screen) {
-	return request.post("/spread/people", screen);
+  return request.post('/spread/people', screen)
 }
 
 /*
  * 推广人订单
  * */
 export function getSpreadOrder(where) {
-	return request.post("/spread/order", where);
+  return request.post('/spread/order', where)
 }
 
 /*
  * 资金明细（types|0=全部,1=消费,2=充值,3=返佣,4=提现）
  * */
 export function getCommissionInfo(q, types) {
-	return request.get("/spread/commission/" + types, q);
+  return request.get('/spread/commission/' + types, q)
 }
 
 /*
  * 积分记录
  * */
 export function getIntegralList(q) {
-	return request.get("/integral/list", q);
+  return request.get('/integral/list', q)
 }
 
 /*
  * 提现银行
  * */
 export function getBank() {
-	return request.get("/extract/bank");
+  return request.get('/extract/bank')
 }
 
 /*
  * 提现申请
  * */
 export function postCashInfo(cash) {
-	return request.post("/extract/cash", cash);
+  return request.post('/extract/cash', cash)
 }
 
 /*
  * 会员中心
  * */
 export function getVipInfo() {
-	return request.get("/user/level/grade");
+  return request.get('/user/level/grade')
 }
 
 /*
  * 会员等级任务
  * */
 export function getVipTask(id) {
-	return request.get("/user/level/task/" + id);
+  return request.get('/user/level/task/' + id)
 }
 
 /*
  * 资金统计
  * */
 export function getBalance() {
-	return request.get("/user/balance");
+  return request.get('/user/balance')
 }
 
 /*
  * 活动状态
  * */
 export function getActivityStatus() {
-	return request.get("/user/activity", {}, {
-		login: false
-	});
+  return request.get(
+    '/user/activity',
+    {},
+    {
+      login: false,
+    }
+  )
 }
 
 /*
  * 活动状态
  * */
 export function getSpreadImg(data) {
-
-	return request.get("/spread/banner", data);
+  return request.get('/spread/banner', data)
 }
 
 /*
  * 用户修改信息
  * */
 export function postUserEdit(data) {
-	return request.post("/user/edit", data);
+  return request.post('/user/edit', data)
 }
 
 /*
  * 用户修改信息
  * */
 export function getChatRecord(to_uid, data) {
-	return request.get("user/service/record/" + to_uid, data);
+  return request.get('user/service/record/' + to_uid, data)
 }
 
 /*
  * 用户修改信息
  * */
 export function serviceList() {
-	return request.get("user/service/list");
+  return request.get('user/service/list')
 }
 
 /*
  * 公众号充值
  * */
 export function rechargeWechat(data) {
-	return request.post("/recharge/wechat", data);
+  return request.post('/recharge/wechat', data)
 }
 
 /*
  * 退出登录
  * */
 export function getLogout() {
-	return request.post("/auth/logout");
+  return request.post('/auth/logout')
 }
 
 /*
- * 绑定手机号
+ * 小程序绑定手机号
  * */
 export function bindingPhone(data) {
-	return request.post("wxapp/binding", data);
+  return request.post('/binding', data)
+}
+
+/*
+ * 绑定手机号
+ * */
+export function wxappBindingPhone(data) {
+  return request.post('wxapp/binding', data)
 }
 
 /*
  * h5切换公众号登陆
  * */
 export function switchH5Login() {
-	return request.post("switch_h5", {
-		from: "wechat"
-	});
+  return request.post('switch_h5', {
+    from: 'wechat',
+  })
 }
 /*
  * 获取推广人排行
  * */
 export function getRankList(q) {
-	return request.get("rank", q);
+  return request.get('rank', q)
 }
 /*
  * 获取佣金排名
  * */
 export function getBrokerageRank(q) {
-	return request.get("brokerage_rank", q);
+  return request.get('brokerage_rank', q)
 }
 
 /**
  * 检测会员等级
  */
 export function setDetection() {
-	return request.get("user/level/detection");
+  return request.get('user/level/detection')
 }
 
-
 export function getRechargeApi() {
-	return request.get("recharge/index");
+  return request.get('recharge/index')
 }
diff --git a/components/Adv.vue b/components/Adv.vue
index 37d777f..af6dbad 100644
--- a/components/Adv.vue
+++ b/components/Adv.vue
@@ -1,209 +1,210 @@
 <template>
-	<view class="adv-box mx20 mb10">
-		<!-- 模板1-->
-		<view class="x-f" v-if="detail.style == 1">
-			<image style="width:710rpx;height: 220rpx;" @tap="jump(detail.list[0].uniapp_url)" :src="detail.list[0].image" mode="aspectFill"></image>
-		</view>
-		<!-- 模板2-->
-		<view class="type1 x-f" v-if="detail.style == 2">
-			<image class="type1-img" @tap="jump(detail.list[0].uniapp_url)" :src="detail.list[0].image" mode="aspectFill"></image>
-			<image class="type1-img" @tap="jump(detail.list[1].uniapp_url)" :src="detail.list[1].image" mode="aspectFill"></image>
-		</view>
-		<!-- 模板3-->
-		<view class="type2 x-bc" v-if="detail.style == 3">
-			<image class="type2-img1" @tap="jump(detail.list[0].uniapp_url)" :src="detail.list[0].image" mode="aspectFill"></image>
-			<view class="y-f type2-box">
-				<image class="type2-img2" @tap="jump(detail.list[1].uniapp_url)" :src="detail.list[1].image" mode="aspectFill" style="border-bottom:1rpx solid #f6f6f6"></image>
-				<image class="type2-img2" @tap="jump(detail.list[2].uniapp_url)" :src="detail.list[2].image" mode="aspectFill"></image>
-			</view>
-		</view>
-		<!-- 模板4-->
-		<view class="type3 x-bc" v-if="detail.style == 4">
-			<view class="type3-box y-f">
-				<image class="type3-img1" @tap="jump(detail.list[0].uniapp_url)" :src="detail.list[0].image" mode="aspectFill"></image>
-				<image class="type3-img1" @tap="jump(detail.list[1].uniapp_url)" :src="detail.list[1].image" mode="aspectFill"></image>
-			</view>
-			<image class="type3-img2" @tap="jump(detail.list[2].uniapp_url)" :src="detail.list[2].image" mode="aspectFill"></image>
-		</view>
-		<!-- 模板5-->
-		<view class="type4 y-f" v-if="detail.style == 5">
-			<view class="type4-box x-f">
-				<image class="type4-img1" @tap="jump(detail.list[0].uniapp_url)" :src="detail.list[0].image" mode="aspectFill"></image>
-				<image class="type4-img1" @tap="jump(detail.list[1].uniapp_url)" :src="detail.list[1].image" mode="aspectFill"></image>
-			</view>
-			<image class="type4-img2" @tap="jump(detail.list[2].uniapp_url)" :src="detail.list[2].image" mode="aspectFill"></image>
-		</view>
-		<!-- 模板6-->
-		<view class="type5 y-f" v-if="detail.style == 6">
-			<image class="type5-img1" @tap="jump(detail.list[0].uniapp_url)" :src="detail.list[0].image" mode="aspectFill"></image>
-			<view class="type5-box x-bc">
-				<image class="type5-img2" @tap="jump(detail.list[1].uniapp_url)" :src="detail.list[1].image" mode="aspectFill" style="border-bottom:1rpx solid #f6f6f6"></image>
-				<image class="type5-img2" @tap="jump(detail.list[2].uniapp_url)" :src="detail.list[2].image" mode="aspectFill"></image>
-			</view>
-		</view>
-		<!-- 模板7-->
-		<view class="type6 y-f" v-if="detail.style == 7">
-			<view class="x-f type6-box1">
-				<image class="type6-img1" @tap="jump(detail.list[0].uniapp_url)" :src="detail.list[0].image" mode="aspectFill"></image>
-				<image class="type6-img1" @tap="jump(detail.list[1].uniapp_url)" :src="detail.list[1].image" mode="aspectFill"></image>
-			</view>
-			<view class="x-f type6-box2">
-				<image class="type6-img2" @tap="jump(detail.list[2].uniapp_url)" :src="detail.list[2].image" mode="aspectFill"></image>
-				<image class="type6-img2" @tap="jump(detail.list[3].uniapp_url)" :src="detail.list[3].image" mode="aspectFill"></image>
-				<image class="type6-img2" @tap="jump(detail.list[4].uniapp_url)" :src="detail.list[4].image" mode="aspectFill"></image>
-			</view>
-		</view>
-	</view>
+  <view class="adv-box mx20 mb10">
+    <!-- 模板1-->
+    <view class="x-f" v-if="detail.style == 1">
+      <image style="width: 710rpx; height: 220rpx" @tap="jump(detail.list[0])" :src="detail.list[0].image" mode="aspectFill"></image>
+    </view>
+    <!-- 模板2-->
+    <view class="type1 x-f" v-if="detail.style == 2">
+      <image class="type1-img" @tap="jump(detail.list[0])" :src="detail.list[0].image" mode="aspectFill"></image>
+      <image class="type1-img" @tap="jump(detail.list[1])" :src="detail.list[1].image" mode="aspectFill"></image>
+    </view>
+    <!-- 模板3-->
+    <view class="type2 x-bc" v-if="detail.style == 3">
+      <image class="type2-img1" @tap="jump(detail.list[0])" :src="detail.list[0].image" mode="aspectFill"></image>
+      <view class="y-f type2-box">
+        <image class="type2-img2" @tap="jump(detail.list[1])" :src="detail.list[1].image" mode="aspectFill" style="border-bottom: 1rpx solid #f6f6f6"></image>
+        <image class="type2-img2" @tap="jump(detail.list[2])" :src="detail.list[2].image" mode="aspectFill"></image>
+      </view>
+    </view>
+    <!-- 模板4-->
+    <view class="type3 x-bc" v-if="detail.style == 4">
+      <view class="type3-box y-f">
+        <image class="type3-img1" @tap="jump(detail.list[0])" :src="detail.list[0].image" mode="aspectFill"></image>
+        <image class="type3-img1" @tap="jump(detail.list[1])" :src="detail.list[1].image" mode="aspectFill"></image>
+      </view>
+      <image class="type3-img2" @tap="jump(detail.list[2])" :src="detail.list[2].image" mode="aspectFill"></image>
+    </view>
+    <!-- 模板5-->
+    <view class="type4 y-f" v-if="detail.style == 5">
+      <view class="type4-box x-f">
+        <image class="type4-img1" @tap="jump(detail.list[0])" :src="detail.list[0].image" mode="aspectFill"></image>
+        <image class="type4-img1" @tap="jump(detail.list[1])" :src="detail.list[1].image" mode="aspectFill"></image>
+      </view>
+      <image class="type4-img2" @tap="jump(detail.list[2])" :src="detail.list[2].image" mode="aspectFill"></image>
+    </view>
+    <!-- 模板6-->
+    <view class="type5 y-f" v-if="detail.style == 6">
+      <image class="type5-img1" @tap="jump(detail.list[0])" :src="detail.list[0].image" mode="aspectFill"></image>
+      <view class="type5-box x-bc">
+        <image class="type5-img2" @tap="jump(detail.list[1])" :src="detail.list[1].image" mode="aspectFill" style="border-bottom: 1rpx solid #f6f6f6"></image>
+        <image class="type5-img2" @tap="jump(detail.list[2])" :src="detail.list[2].image" mode="aspectFill"></image>
+      </view>
+    </view>
+    <!-- 模板7-->
+    <view class="type6 y-f" v-if="detail.style == 7">
+      <view class="x-f type6-box1">
+        <image class="type6-img1" @tap="jump(detail.list[0])" :src="detail.list[0].image" mode="aspectFill"></image>
+        <image class="type6-img1" @tap="jump(detail.list[1])" :src="detail.list[1].image" mode="aspectFill"></image>
+      </view>
+      <view class="x-f type6-box2">
+        <image class="type6-img2" @tap="jump(detail.list[2])" :src="detail.list[2].image" mode="aspectFill"></image>
+        <image class="type6-img2" @tap="jump(detail.list[3])" :src="detail.list[3].image" mode="aspectFill"></image>
+        <image class="type6-img2" @tap="jump(detail.list[4])" :src="detail.list[4].image" mode="aspectFill"></image>
+      </view>
+    </view>
+  </view>
 </template>
 
 <script>
 export default {
-	components: {},
-	data() {
-		return {};
-	},
-	props: {
-		detail: Object
-	},
-	computed: {},
-	created() {},
-	methods: {
-		// 路由跳转
-		jump(path) {
-			if (item.uniapp_url) {
-			    this.$yrouter.push(path)
-			}
-		}
-	}
-};
+  components: {},
+  data() {
+    return {}
+  },
+  props: {
+    detail: Object,
+  },
+  computed: {},
+  created() {},
+  methods: {
+    // 路由跳转
+    jump(item) {
+      console.log(item)
+      if (item) {
+        this.$yrouter.push(path)
+      }
+    },
+  },
+}
 </script>
 
 <style lang="scss">
 .adv-box {
-	background-color: #fff;
-	border-radius: 20rpx;
-	overflow: hidden;
-	.type1 {
-		.type1-img {
-			flex: 1;
-			height: 220rpx;
-
-			&:first-child {
-				border-right: 1rpx solid #f6f6f6;
-			}
-		}
-	}
-
-	.type2 {
-		.type2-img1 {
-			width: (710rpx/2);
-			height: 340rpx;
-			border-right: 1rpx solid #f6f6f6;
-		}
-
-		.type2-box {
-			flex: 1;
-			height: 340rpx;
-			width: (710rpx/2);
-
-			.type2-img2 {
-				height: (340rpx/2);
-			}
-		}
-	}
-
-	.type3 {
-		.type3-box {
-			width: (710rpx/2);
-			border-right: 1rpx solid #f6f6f6;
-			.type3-img1 {
-				flex: 1;
-				height: (340rpx/2);
-
-				&:first-child {
-					border-bottom: 1rpx solid #f6f6f6;
-				}
-			}
-		}
-
-		.type3-img2 {
-			flex: 1;
-			height: 340rpx;
-			width: (710rpx/2);
-		}
-	}
-
-	.type4 {
-		.type4-box {
-			border-bottom: 1rpx solid #f6f6f6;
-			.type4-img1 {
-				flex: 1;
-				height: (340rpx/2);
-
-				&:first-child {
-					border-right: 1rpx solid #f6f6f6;
-				}
-			}
-		}
-
-		.type4-img2 {
-			flex: 1;
-			height: (340rpx/2);
-			width: 710rpx;
-		}
-	}
-
-	.type5 {
-		.type5-img1 {
-			width: 710rpx;
-			height: (340rpx/2);
-			border-bottom: 1rpx solid #f6f6f6;
-		}
-
-		.type5-box {
-			flex: 1;
-			height: (340rpx/2);
-			width: 710rpx;
-
-			.type5-img2 {
-				height: (340rpx/2);
-
-				&:first-child {
-					border-right: 1rpx solid #f6f6f6;
-				}
-			}
-		}
-	}
-
-	.type6 {
-		.type6-box1 {
-			.type6-img1 {
-				width: (710rpx/2);
-				height: (340rpx/2);
-
-				&:first-child {
-					border-right: 1rpx solid #f6f6f6;
-				}
-			}
-		}
-
-		.type6-box2 {
-			border-top: 1rpx solid #f6f6f6;
-
-			.type6-img2 {
-				width: (710rpx/3);
-				height: (340rpx/2);
-				border-right: 1rpx solid #f6f6f6;
-
-				&:last-child {
-					border-right: 0;
-				}
-			}
-		}
-	}
-
-	image {
-		// background-color: #ccc;
-	}
+  background-color: #fff;
+  border-radius: 20rpx;
+  overflow: hidden;
+  .type1 {
+    .type1-img {
+      flex: 1;
+      height: 220rpx;
+
+      &:first-child {
+        border-right: 1rpx solid #f6f6f6;
+      }
+    }
+  }
+
+  .type2 {
+    .type2-img1 {
+      width: (710rpx/2);
+      height: 340rpx;
+      border-right: 1rpx solid #f6f6f6;
+    }
+
+    .type2-box {
+      flex: 1;
+      height: 340rpx;
+      width: (710rpx/2);
+
+      .type2-img2 {
+        height: (340rpx/2);
+      }
+    }
+  }
+
+  .type3 {
+    .type3-box {
+      width: (710rpx/2);
+      border-right: 1rpx solid #f6f6f6;
+      .type3-img1 {
+        flex: 1;
+        height: (340rpx/2);
+
+        &:first-child {
+          border-bottom: 1rpx solid #f6f6f6;
+        }
+      }
+    }
+
+    .type3-img2 {
+      flex: 1;
+      height: 340rpx;
+      width: (710rpx/2);
+    }
+  }
+
+  .type4 {
+    .type4-box {
+      border-bottom: 1rpx solid #f6f6f6;
+      .type4-img1 {
+        flex: 1;
+        height: (340rpx/2);
+
+        &:first-child {
+          border-right: 1rpx solid #f6f6f6;
+        }
+      }
+    }
+
+    .type4-img2 {
+      flex: 1;
+      height: (340rpx/2);
+      width: 710rpx;
+    }
+  }
+
+  .type5 {
+    .type5-img1 {
+      width: 710rpx;
+      height: (340rpx/2);
+      border-bottom: 1rpx solid #f6f6f6;
+    }
+
+    .type5-box {
+      flex: 1;
+      height: (340rpx/2);
+      width: 710rpx;
+
+      .type5-img2 {
+        height: (340rpx/2);
+
+        &:first-child {
+          border-right: 1rpx solid #f6f6f6;
+        }
+      }
+    }
+  }
+
+  .type6 {
+    .type6-box1 {
+      .type6-img1 {
+        width: (710rpx/2);
+        height: (340rpx/2);
+
+        &:first-child {
+          border-right: 1rpx solid #f6f6f6;
+        }
+      }
+    }
+
+    .type6-box2 {
+      border-top: 1rpx solid #f6f6f6;
+
+      .type6-img2 {
+        width: (710rpx/3);
+        height: (340rpx/2);
+        border-right: 1rpx solid #f6f6f6;
+
+        &:last-child {
+          border-right: 0;
+        }
+      }
+    }
+  }
+
+  image {
+    // background-color: #ccc;
+  }
 }
 </style>
diff --git a/components/sh-adv.vue b/components/sh-adv.vue
index 887c771..6c04cde 100644
--- a/components/sh-adv.vue
+++ b/components/sh-adv.vue
@@ -1,240 +1,217 @@
 <template>
-	<view class="adv-box mx20 mb10">
-		<!-- 模板1-->
-		<view class="x-f" v-if="detail.style == 1">
-			<image style="width:710rpx;height: 220rpx;" @tap="jump(detail.list[0].path)" :src="detail.list[0].image"
-				mode="aspectFill"></image>
-		</view>
-		<!-- 模板2-->
-		<view class="type1 x-f" v-if="detail.style == 2">
-			<image class="type1-img" @tap="jump(detail.list[0].path)" :src="detail.list[0].image" mode="aspectFill">
-			</image>
-			<image class="type1-img" @tap="jump(detail.list[1].path)" :src="detail.list[1].image" mode="aspectFill">
-			</image>
-		</view>
-		<!-- 模板3-->
-		<view class="type2 x-bc" v-if="detail.style == 3">
-			<image class="type2-img1" @tap="jump(detail.list[0].path)" :src="detail.list[0].image" mode="aspectFill">
-			</image>
-			<view class="y-f type2-box">
-				<image class="type2-img2" @tap="jump(detail.list[1].path)" :src="detail.list[1].image" mode="aspectFill"
-					style="border-bottom:1rpx solid #f6f6f6"></image>
-				<image class="type2-img2" @tap="jump(detail.list[2].path)" :src="detail.list[2].image"
-					mode="aspectFill"></image>
-			</view>
-		</view>
-		<!-- 模板4-->
-		<view class="type3 x-bc" v-if="detail.style == 4">
-			<view class="type3-box y-f">
-				<image class="type3-img1" @tap="jump(detail.list[0].path)" :src="detail.list[0].image"
-					mode="aspectFill"></image>
-				<image class="type3-img1" @tap="jump(detail.list[1].path)" :src="detail.list[1].image"
-					mode="aspectFill"></image>
-			</view>
-			<image class="type3-img2" @tap="jump(detail.list[2].path)" :src="detail.list[2].image" mode="aspectFill">
-			</image>
-		</view>
-		<!-- 模板5-->
-		<view class="type4 y-f" v-if="detail.style == 5">
-			<view class="type4-box x-f">
-				<image class="type4-img1" @tap="jump(detail.list[0].path)" :src="detail.list[0].image"
-					mode="aspectFill"></image>
-				<image class="type4-img1" @tap="jump(detail.list[1].path)" :src="detail.list[1].image"
-					mode="aspectFill"></image>
-			</view>
-			<image class="type4-img2" @tap="jump(detail.list[2].path)" :src="detail.list[2].image" mode="aspectFill">
-			</image>
-		</view>
-		<!-- 模板6-->
-		<view class="type5 y-f" v-if="detail.style == 6">
-			<image class="type5-img1" @tap="jump(detail.list[0].path)" :src="detail.list[0].image" mode="aspectFill">
-			</image>
-			<view class="type5-box x-bc">
-				<image class="type5-img2" @tap="jump(detail.list[1].path)" :src="detail.list[1].image" mode="aspectFill"
-					style="border-bottom:1rpx solid #f6f6f6"></image>
-				<image class="type5-img2" @tap="jump(detail.list[2].path)" :src="detail.list[2].image"
-					mode="aspectFill"></image>
-			</view>
-		</view>
-		<!-- 模板7-->
-		<view class="type6 y-f" v-if="detail.style == 7">
-			<view class="x-f type6-box1">
-				<image class="type6-img1" @tap="jump(detail.list[0].path)" :src="detail.list[0].image"
-					mode="aspectFill"></image>
-				<image class="type6-img1" @tap="jump(detail.list[1].path)" :src="detail.list[1].image"
-					mode="aspectFill"></image>
-			</view>
-			<view class="x-f type6-box2">
-				<image class="type6-img2" @tap="jump(detail.list[2].path)" :src="detail.list[2].image"
-					mode="aspectFill"></image>
-				<image class="type6-img2" @tap="jump(detail.list[3].path)" :src="detail.list[3].image"
-					mode="aspectFill"></image>
-				<image class="type6-img2" @tap="jump(detail.list[4].path)" :src="detail.list[4].image"
-					mode="aspectFill"></image>
-			</view>
-		</view>
-	</view>
+  <view class="adv-box mx20 mb10">
+    <!-- 模板1-->
+    <view class="x-f" v-if="detail.style == 1">
+      <image style="width: 710rpx; height: 220rpx" @tap="jump(detail.list[0])" :src="detail.list[0].image" mode="aspectFill"></image>
+    </view>
+    <!-- 模板2-->
+    <view class="type1 x-f" v-if="detail.style == 2">
+      <image class="type1-img" @tap="jump(detail.list[0])" :src="detail.list[0].image" mode="aspectFill"> </image>
+      <image class="type1-img" @tap="jump(detail.list[1])" :src="detail.list[1].image" mode="aspectFill"> </image>
+    </view>
+    <!-- 模板3-->
+    <view class="type2 x-bc" v-if="detail.style == 3">
+      <image class="type2-img1" @tap="jump(detail.list[0])" :src="detail.list[0].image" mode="aspectFill"> </image>
+      <view class="y-f type2-box">
+        <image class="type2-img2" @tap="jump(detail.list[1])" :src="detail.list[1].image" mode="aspectFill" style="border-bottom: 1rpx solid #f6f6f6"></image>
+        <image class="type2-img2" @tap="jump(detail.list[2])" :src="detail.list[2].image" mode="aspectFill"></image>
+      </view>
+    </view>
+    <!-- 模板4-->
+    <view class="type3 x-bc" v-if="detail.style == 4">
+      <view class="type3-box y-f">
+        <image class="type3-img1" @tap="jump(detail.list[0])" :src="detail.list[0].image" mode="aspectFill"></image>
+        <image class="type3-img1" @tap="jump(detail.list[1])" :src="detail.list[1].image" mode="aspectFill"></image>
+      </view>
+      <image class="type3-img2" @tap="jump(detail.list[2])" :src="detail.list[2].image" mode="aspectFill"> </image>
+    </view>
+    <!-- 模板5-->
+    <view class="type4 y-f" v-if="detail.style == 5">
+      <view class="type4-box x-f">
+        <image class="type4-img1" @tap="jump(detail.list[0])" :src="detail.list[0].image" mode="aspectFill"></image>
+        <image class="type4-img1" @tap="jump(detail.list[1])" :src="detail.list[1].image" mode="aspectFill"></image>
+      </view>
+      <image class="type4-img2" @tap="jump(detail.list[2])" :src="detail.list[2].image" mode="aspectFill"> </image>
+    </view>
+    <!-- 模板6-->
+    <view class="type5 y-f" v-if="detail.style == 6">
+      <image class="type5-img1" @tap="jump(detail.list[0])" :src="detail.list[0].image" mode="aspectFill"> </image>
+      <view class="type5-box x-bc">
+        <image class="type5-img2" @tap="jump(detail.list[1])" :src="detail.list[1].image" mode="aspectFill" style="border-bottom: 1rpx solid #f6f6f6"></image>
+        <image class="type5-img2" @tap="jump(detail.list[2])" :src="detail.list[2].image" mode="aspectFill"></image>
+      </view>
+    </view>
+    <!-- 模板7-->
+    <view class="type6 y-f" v-if="detail.style == 7">
+      <view class="x-f type6-box1">
+        <image class="type6-img1" @tap="jump(detail.list[0])" :src="detail.list[0].image" mode="aspectFill"></image>
+        <image class="type6-img1" @tap="jump(detail.list[1])" :src="detail.list[1].image" mode="aspectFill"></image>
+      </view>
+      <view class="x-f type6-box2">
+        <image class="type6-img2" @tap="jump(detail.list[2])" :src="detail.list[2].image" mode="aspectFill"></image>
+        <image class="type6-img2" @tap="jump(detail.list[3])" :src="detail.list[3].image" mode="aspectFill"></image>
+        <image class="type6-img2" @tap="jump(detail.list[4])" :src="detail.list[4].image" mode="aspectFill"></image>
+      </view>
+    </view>
+  </view>
 </template>
 
 <script>
-	export default {
-		components: {},
-		data() {
-			return {
-				
-			};
-		},
-		props: {
-			detail:Object
-		},
-		computed: {},
-		created() {
-		},
-		mounted() {
-		console.log(this)	
-		},
-		methods: {
-			// 路由跳转
-			jump(path) {
-				this.$yrouter.push({
-					path
-				});
-			}
-		}
-	};
+export default {
+  components: {},
+  data() {
+    return {}
+  },
+  props: {
+    detail: Object,
+  },
+  computed: {},
+  created() {},
+  mounted() {
+    console.log(this)
+  },
+  methods: {
+    // 路由跳转
+    jump(item) {
+      if (item.uniapp_url) {
+        this.$yrouter.push(item.uniapp_url)
+      }
+    },
+  },
+}
 </script>
 
 <style lang="scss">
-	.adv-box {
-		background-color: #fff;
-		border-radius: 20rpx;
-		overflow: hidden;
-image{
-	width: 100%;
+.adv-box {
+  background-color: #fff;
+  border-radius: 20rpx;
+  overflow: hidden;
+  image {
+    width: 100%;
+  }
+  .type1 {
+    .type1-img {
+      flex: 1;
+      height: 220rpx;
+
+      &:first-child {
+        border-right: 1rpx solid #f6f6f6;
+      }
+    }
+  }
+
+  .type2 {
+    .type2-img1 {
+      width: (710rpx/2);
+      height: 340rpx;
+      border-right: 1rpx solid #f6f6f6;
+    }
+
+    .type2-box {
+      flex: 1;
+      height: 340rpx;
+      width: (710rpx/2);
+
+      .type2-img2 {
+        height: (340rpx/2);
+      }
+    }
+  }
+
+  .type3 {
+    .type3-box {
+      width: (710rpx/2);
+      border-right: 1rpx solid #f6f6f6;
+
+      .type3-img1 {
+        flex: 1;
+        height: (340rpx/2);
+
+        &:first-child {
+          border-bottom: 1rpx solid #f6f6f6;
+        }
+      }
+    }
+
+    .type3-img2 {
+      flex: 1;
+      height: 340rpx;
+      width: (710rpx/2);
+    }
+  }
+
+  .type4 {
+    .type4-box {
+      border-bottom: 1rpx solid #f6f6f6;
+
+      .type4-img1 {
+        flex: 1;
+        height: (340rpx/2);
+
+        &:first-child {
+          border-right: 1rpx solid #f6f6f6;
+        }
+      }
+    }
+
+    .type4-img2 {
+      flex: 1;
+      height: (340rpx/2);
+      width: 710rpx;
+    }
+  }
+
+  .type5 {
+    .type5-img1 {
+      width: 710rpx;
+      height: (340rpx/2);
+      border-bottom: 1rpx solid #f6f6f6;
+    }
+
+    .type5-box {
+      flex: 1;
+      height: (340rpx/2);
+      width: 710rpx;
+
+      .type5-img2 {
+        height: (340rpx/2);
+
+        &:first-child {
+          border-right: 1rpx solid #f6f6f6;
+        }
+      }
+    }
+  }
+
+  .type6 {
+    .type6-box1 {
+      .type6-img1 {
+        width: (710rpx/2);
+        height: (340rpx/2);
+
+        &:first-child {
+          border-right: 1rpx solid #f6f6f6;
+        }
+      }
+    }
+
+    .type6-box2 {
+      border-top: 1rpx solid #f6f6f6;
+
+      .type6-img2 {
+        width: (710rpx/3);
+        height: (340rpx/2);
+        border-right: 1rpx solid #f6f6f6;
+
+        &:last-child {
+          border-right: 0;
+        }
+      }
+    }
+  }
+
+  image {
+    // background-color: #ccc;
+  }
 }
-		.type1 {
-			.type1-img {
-				flex: 1;
-				height: 220rpx;
-
-				&:first-child {
-					border-right: 1rpx solid #f6f6f6;
-				}
-			}
-		}
-
-		.type2 {
-			.type2-img1 {
-				width: (710rpx/2);
-				height: 340rpx;
-				border-right: 1rpx solid #f6f6f6;
-			}
-
-			.type2-box {
-				flex: 1;
-				height: 340rpx;
-				width: (710rpx/2);
-
-				.type2-img2 {
-					height: (340rpx/2);
-				}
-			}
-		}
-
-		.type3 {
-			.type3-box {
-				width: (710rpx/2);
-				border-right: 1rpx solid #f6f6f6;
-
-				.type3-img1 {
-					flex: 1;
-					height: (340rpx/2);
-
-					&:first-child {
-						border-bottom: 1rpx solid #f6f6f6;
-					}
-				}
-			}
-
-			.type3-img2 {
-				flex: 1;
-				height: 340rpx;
-				width: (710rpx/2);
-			}
-		}
-
-		.type4 {
-			.type4-box {
-				border-bottom: 1rpx solid #f6f6f6;
-
-				.type4-img1 {
-					flex: 1;
-					height: (340rpx/2);
-
-					&:first-child {
-						border-right: 1rpx solid #f6f6f6;
-					}
-				}
-			}
-
-			.type4-img2 {
-				flex: 1;
-				height: (340rpx/2);
-				width: 710rpx;
-			}
-		}
-
-		.type5 {
-			.type5-img1 {
-				width: 710rpx;
-				height: (340rpx/2);
-				border-bottom: 1rpx solid #f6f6f6;
-			}
-
-			.type5-box {
-				flex: 1;
-				height: (340rpx/2);
-				width: 710rpx;
-
-				.type5-img2 {
-					height: (340rpx/2);
-
-					&:first-child {
-						border-right: 1rpx solid #f6f6f6;
-					}
-				}
-			}
-		}
-
-		.type6 {
-			.type6-box1 {
-				.type6-img1 {
-					width: (710rpx/2);
-					height: (340rpx/2);
-
-					&:first-child {
-						border-right: 1rpx solid #f6f6f6;
-					}
-				}
-			}
-
-			.type6-box2 {
-				border-top: 1rpx solid #f6f6f6;
-
-				.type6-img2 {
-					width: (710rpx/3);
-					height: (340rpx/2);
-					border-right: 1rpx solid #f6f6f6;
-
-					&:last-child {
-						border-right: 0;
-					}
-				}
-			}
-		}
-
-		image {
-			// background-color: #ccc;
-		}
-	}
 </style>
diff --git a/pages/home/components/Banner.vue b/pages/home/components/Banner.vue
index a45a769..7e66cc3 100644
--- a/pages/home/components/Banner.vue
+++ b/pages/home/components/Banner.vue
@@ -1,131 +1,131 @@
 <template>
-    <view class="banner-swiper-box">
-        <canvas canvas-id="colorThief" class="hide-canvas"></canvas>
-        <swiper class="banner-carousel Shop-selector-rect" circular @change="swiperChange" :autoplay="true">
-            <swiper-item v-for="(item, index) in detail" :key="index" class="carousel-item">
-                <image class="swiper-image " :src="item.pic" @click="goRoll(item)" mode="widthFix" lazy-load>
-                </image>
-            </swiper-item>
-        </swiper>
-        <view class="banner-swiper-dots">
-            <text :class="swiperCurrent === index ? 'banner-dot-active' : 'banner-dot'"
-                v-for="(dot, index) in detail.length" :key="index"></text>
-        </view>
-    </view>
+	<view class="banner-swiper-box">
+		<canvas canvas-id="colorThief" class="hide-canvas"></canvas>
+		<swiper class="banner-carousel Shop-selector-rect" circular @change="swiperChange" :autoplay="true">
+			<swiper-item v-for="(item, index) in detail" :key="index" class="carousel-item">
+				<image class="swiper-image " :src="item.pic" @click="goRoll(item)" mode="widthFix" lazy-load>
+				</image>
+			</swiper-item>
+		</swiper>
+		<view class="banner-swiper-dots">
+			<text :class="swiperCurrent === index ? 'banner-dot-active' : 'banner-dot'" v-for="(dot, index) in detail.length"
+			 :key="index"></text>
+		</view>
+	</view>
 </template>
 
 <script>
-    import colorThief from 'miniapp-color-thief';
+	import colorThief from 'miniapp-color-thief';
 
-    export default {
-        data() {
-            return {
-                swiperCurrent: 0, //轮播下标
-                webviewId: 0,
-            };
-        },
-        props: {
-            detail: {
-                type: Array,
-                default: []
-            }
-        },
-        created: async function () {
-            await this.doColorThief();
-        },
-        computed: {},
-        methods: {
-            async doColorThief() {
-                let that = this;
-                // 获取轮播图
-                let item = this.detail[this.swiperCurrent];
-                // 获取轮播图颜色
-                let bgcolor = item.color;
-                // 颜色不存在
-                if (bgcolor === '') {
-                    that.$set(item, 'bgcolor', '#c40414');
-                that.$emit('getbgcolor', '#c40414');
-                } else {
-                    that.$set(item, 'bgcolor', bgcolor);
-                    that.$emit('getbgcolor', bgcolor);
-                }
+	export default {
+		data() {
+			return {
+				swiperCurrent: 0, //轮播下标
+				webviewId: 0,
+			};
+		},
+		props: {
+			detail: {
+				type: Array,
+				default: []
+			}
+		},
+		created: async function() {
+			await this.doColorThief();
+		},
+		computed: {},
+		methods: {
+			async doColorThief() {
+				let that = this;
+				// 获取轮播图
+				let item = this.detail[this.swiperCurrent];
+				// 获取轮播图颜色
+				let bgcolor = item.color;
+				// 颜色不存在
+				if (!bgcolor) {
+					that.$set(item, 'bgcolor', '#c40414');
+					that.$emit('getbgcolor', '#c40414');
+				} else {
+					that.$set(item, 'bgcolor', bgcolor);
+					that.$emit('getbgcolor', bgcolor);
+				}
 
-            },
-            swiperChange(e) {
-                this.swiperCurrent = e.detail.current;
-                this.doColorThief();
-                let bgcolor = this.detail[this.swiperCurrent].bgcolor;
-                this.$emit('getbgcolor', bgcolor);
-            },
+			},
+			swiperChange(e) {
+				this.swiperCurrent = e.detail.current;
+				this.doColorThief();
+				let bgcolor = this.detail[this.swiperCurrent].bgcolor;
+				this.$emit('getbgcolor', bgcolor);
+			},
 
-            // 路由跳转
-            goRoll(item) {
-                if (item.uniapp_url) {
-                    this.$yrouter.push(item.uniapp_url)
-                }
-            },
-        }
+			// 路由跳转
+			goRoll(item) {
+				if (item.uniapp_url) {
+					this.$yrouter.push(item.uniapp_url)
+				}
+			},
+		}
 
-    }
+	}
 </script>
 
 <style lang="less">
-    // 轮播
-    .banner-swiper-box {
-        background: #fff;
-    }
+	// 轮播
+	.banner-swiper-box {
+		background: #fff;
+	}
 
-    .banner-swiper-box,
-    .banner-carousel {
-        width: 750rpx;
-        height: 350upx;
-        position: relative;
+	.banner-swiper-box,
+	.banner-carousel {
+		width: 750rpx;
+		height: 350upx;
+		position: relative;
 
-        .carousel-item {
-            width: 100%;
-            height: 100%;
-            // padding: 0 28upx;
-            overflow: hidden;
-        }
+		.carousel-item {
+			width: 100%;
+			height: 100%;
+			// padding: 0 28upx;
+			overflow: hidden;
+		}
 
-        .swiper-image {
-            width: 100%;
-            height: 100%;
-            // border-radius: 10upx;
-            // background: #ccc;
-        }
-    }
+		.swiper-image {
+			width: 100%;
+			height: 100%;
+			// border-radius: 10upx;
+			// background: #ccc;
+		}
+	}
 
-    .banner-swiper-dots {
-        display: flex;
-        position: absolute;
-        left: 50%;
-        transform: translateX(-50%);
-        bottom: 20rpx;
-        z-index: 5;
+	.banner-swiper-dots {
+		display: flex;
+		position: absolute;
+		left: 50%;
+		transform: translateX(-50%);
+		bottom: 20rpx;
+		z-index: 5;
 
-        .banner-dot {
-            width: 14rpx;
-            height: 14rpx;
-            background: rgba(255, 255, 255, 1);
-            border-radius: 50%;
-            margin-right: 10rpx;
-        }
+		.banner-dot {
+			width: 14rpx;
+			height: 14rpx;
+			background: rgba(255, 255, 255, 1);
+			border-radius: 50%;
+			margin-right: 10rpx;
+		}
 
-        .banner-dot-active {
-            width: 14rpx;
-            height: 14rpx;
-            background: #a8700d;
-            border-radius: 50%;
-            margin-right: 10rpx;
-        }
-    }
+		.banner-dot-active {
+			width: 14rpx;
+			height: 14rpx;
+			background: #a8700d;
+			border-radius: 50%;
+			margin-right: 10rpx;
+		}
+	}
 
 
-    .hide-canvas {
-        position: fixed !important;
-        top: -99999upx;
-        left: -99999upx;
-        z-index: -99999;
-    }
+	.hide-canvas {
+		position: fixed !important;
+		top: -99999upx;
+		left: -99999upx;
+		z-index: -99999;
+	}
 </style>
diff --git a/pages/home/index.vue b/pages/home/index.vue
index 7d369d1..a6051d6 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -18,14 +18,14 @@
 				</view>
 			</view>
 			<Banner v-if="item.type=='banner'" :detail="item.componentContent.bannerData" @getbgcolor="getbgcolor"></Banner>
-			<uni-notice-bar v-if="item.type=='noticeBar'" scrollable="true" @click="goRoll(item.componentContent.roll[0])" single="true" :speed="10"
-			 showIcon="true" :text="item.componentContent.roll[0].info"></uni-notice-bar>
+			<uni-notice-bar v-if="item.type=='noticeBar'" scrollable="true" @click="goRoll(item.componentContent.roll[0])"
+			 single="true" :speed="10" showIcon="true" :text="item.componentContent.roll[0].info"></uni-notice-bar>
 			<view class="content_box home_content_box">
 				<!-- 菜单 -->
-				<Menu :list="item.componentContent.menus" v-if="item.type=='menu'"></Menu>
+				<Menu :list="item.componentContent.menus" v-if="item.type=='menu'&&item.componentContent.menus"></Menu>
 				<!-- 滚动新闻 -->
 				<!-- 广告 -->
-				<Adv v-if="item.type=='adv'" :detail="item.componentContent.detail" />
+				<Adv v-if="item.type=='adv'&&item.componentContent.detail" :detail="item.componentContent.detail" />
 				<!-- 热门榜单 -->
 				<HotCommodity v-if="item.type=='hotCommodity'" :detail="likeInfo"></HotCommodity>
 				<!-- 超值拼团 -->
@@ -213,26 +213,26 @@
 			// uni.showLoading({
 			//   title: "加载中",
 			// });
-			getCanvas().then(res => {
-			}).catch(error => {
-				this.homeData = JSON.parse(error.data.json)
-				console.log(this.homeData[4])
+			getCanvas().then(res => {}).catch(error => {
+				this.homeData = JSON.parse(error.data.json)
+				console.log(this.homeData)
+				console.log(222)
 			})
 			getHomeData().then((res) => {
-			  that.logoUrl = res.data.logoUrl;
-			  res.data.banner.map((item) => (item.bgcolor = item.color || ""));
-			  that.$set(that, "info", res.data.info);
-			  that.$set(that, "firstList", res.data.firstList);
-			  that.$set(that, "bastList", res.data.bastList);
-			  that.$set(that, "likeInfo", res.data.likeInfo);
-			  that.$set(that, "live", res.data.liveList);
-			  that.$set(that, "lovely", res.data.lovely);
-			  that.$set(that, "benefit", res.data.benefit);
-			  that.$set(that, "couponList", res.data.couponList);
-			  that.$set(that, "combinationList", res.data.combinationList);
-			  uni.hideLoading();
-			  that.setOpenShare();
-			  // that.doColorThief()
+				that.logoUrl = res.data.logoUrl;
+				res.data.banner.map((item) => (item.bgcolor = item.color || ""));
+				that.$set(that, "info", res.data.info);
+				that.$set(that, "firstList", res.data.firstList);
+				that.$set(that, "bastList", res.data.bastList);
+				that.$set(that, "likeInfo", res.data.likeInfo);
+				that.$set(that, "live", res.data.liveList);
+				that.$set(that, "lovely", res.data.lovely);
+				that.$set(that, "benefit", res.data.benefit);
+				that.$set(that, "couponList", res.data.couponList);
+				that.$set(that, "combinationList", res.data.combinationList);
+				uni.hideLoading();
+				that.setOpenShare();
+				// that.doColorThief()
 			});
 		},
 		methods: {
diff --git a/pages/user/BindingPhone/index.vue b/pages/user/BindingPhone/index.vue
index 29a53d5..e477f63 100644
--- a/pages/user/BindingPhone/index.vue
+++ b/pages/user/BindingPhone/index.vue
@@ -6,158 +6,143 @@
       </view>
       <view class="item acea-row row-between-wrapper">
         <input type="text" placeholder="填写验证码" class="codeIput" v-model="captcha" />
-        <button
-          class="code font-color-red"
-          :disabled="disabled"
-          :class="disabled === true ? 'on' : ''"
-          @click="code"
-        >{{ text }}</button>
+        <button class="code font-color-red" :disabled="disabled" :class="disabled === true ? 'on' : ''" @click="code">{{ text }}</button>
       </view>
     </view>
     <view class="confirmBnt bg-color-red" @click="confirm">确认绑定</view>
   </view>
 </template>
 <script>
-import { mapGetters } from "vuex";
-import sendVerifyCode from "@/mixins/SendVerifyCode";
-import { required, alpha_num, chs_phone } from "@/utils/validate";
-import { validatorDefaultCatch } from "@/utils/dialog";
-import { registerVerify, bindingPhone } from "@/api/user";
+import { mapGetters } from 'vuex'
+import sendVerifyCode from '@/mixins/SendVerifyCode'
+import { required, alpha_num, chs_phone } from '@/utils/validate'
+import { validatorDefaultCatch } from '@/utils/dialog'
+import { registerVerify, wxappBindingPhone } from '@/api/user'
 
 export default {
-  name: "BindingPhone",
+  name: 'BindingPhone',
   components: {},
   props: {},
-  data: function() {
+  data: function () {
     return {
-      captcha: "",
-      phone: "" //手机号
-    };
+      captcha: '',
+      phone: '', //手机号
+    }
   },
   mixins: [sendVerifyCode],
-  computed: mapGetters(["userInfo"]),
-  mounted: function() {},
+  computed: mapGetters(['userInfo']),
+  mounted: function () {},
   methods: {
     async confirm() {
-      let that = this;
-      const { phone, captcha } = that;
+      let that = this
+      const { phone, captcha } = that
       try {
         await that
           .$validator({
-            phone: [
-              chs_phone(chs_phone.message("手机号码")),
-              alpha_num(alpha_num.message())
-            ],
-            captcha: [
-              required(required.message("验证码")),
-              alpha_num(alpha_num.message("验证码"))
-            ]
+            phone: [chs_phone(chs_phone.message('手机号码')), alpha_num(alpha_num.message())],
+            captcha: [required(required.message('验证码')), alpha_num(alpha_num.message('验证码'))],
           })
-          .validate({ phone, captcha });
+          .validate({ phone, captcha })
       } catch (e) {
-        return validatorDefaultCatch(e);
+        return validatorDefaultCatch(e)
       }
-      bindingPhone({
+      wxappBindingPhone({
         phone: this.phone,
-        captcha: this.captcha
+        captcha: this.captcha,
       })
         .then(res => {
           if (res.data !== undefined && res.data.is_bind) {
             uni.showModal({
-              title: "提示",
-              content: "确认绑定?",
-              success: function(res) {
+              title: '提示',
+              content: '确认绑定?',
+              success: function (res) {
                 if (res.confirm) {
-                  bindingPhone({
+                  wxappBindingPhone({
                     phone: this.phone,
                     captcha: this.captcha,
-                    step: 1
+                    step: 1,
                   })
                     .then(res => {
                       uni.showToast({
                         title: res.msg,
-                        icon: "none",
-                        duration: 2000
-                      });
+                        icon: 'none',
+                        duration: 2000,
+                      })
                       that.$yrouter.replace({
-                        path: "/pages/user/PersonalData/index"
-                      });
+                        path: '/pages/user/PersonalData/index',
+                      })
                     })
                     .catch(res => {
                       uni.showToast({
                         title: res.msg,
-                        icon: "none",
-                        duration: 2000
-                      });
+                        icon: 'none',
+                        duration: 2000,
+                      })
                       that.$yrouter.replace({
-                        path: "/pages/user/PersonalData/index"
-                      });
-                    });
+                        path: '/pages/user/PersonalData/index',
+                      })
+                    })
                 } else if (res.cancel) {
                   uni.showToast({
-                    title: "已取消绑定",
-                    icon: "none",
-                    duration: 2000
-                  });
+                    title: '已取消绑定',
+                    icon: 'none',
+                    duration: 2000,
+                  })
                   that.$yrouter.replace({
-                    path: "/pages/user/PersonalData/index"
-                  });
+                    path: '/pages/user/PersonalData/index',
+                  })
                 }
-              }
-            });
+              },
+            })
           } else {
             uni.showToast({
               title: res.msg,
-              icon: "none",
-              duration: 2000
-            });
-            that.$yrouter.replace({ path: "/pages/user/PersonalData/index" });
+              icon: 'none',
+              duration: 2000,
+            })
+            that.$yrouter.replace({ path: '/pages/user/PersonalData/index' })
           }
         })
         .catch(res => {
           uni.showToast({
             title: res.msg,
-            icon: "none",
-            duration: 2000
-          });
-        });
+            icon: 'none',
+            duration: 2000,
+          })
+        })
     },
     async code() {
-      let that = this;
-      const { phone } = that;
+      let that = this
+      const { phone } = that
       try {
         await that
           .$validator({
-            phone: [
-              required(required.message("手机号码")),
-              chs_phone(chs_phone.message())
-            ]
+            phone: [required(required.message('手机号码')), chs_phone(chs_phone.message())],
           })
-          .validate({ phone });
+          .validate({ phone })
       } catch (e) {
-        return validatorDefaultCatch(e);
+        return validatorDefaultCatch(e)
       }
 
       registerVerify({ phone: phone })
         .then(res => {
           uni.showToast({
             title: res.msg,
-            icon: "none",
-            duration: 2000
-          });
-          that.sendCode();
+            icon: 'none',
+            duration: 2000,
+          })
+          that.sendCode()
         })
         .catch(res => {
           uni.showToast({
             title: res.msg,
-            icon: "none",
-            duration: 2000
-          });
-        });
-    }
-  }
-};
+            icon: 'none',
+            duration: 2000,
+          })
+        })
+    },
+  },
+}
 </script>
 
-<style lang="">
-</style>
+<style lang=""></style>