From 57ae931f2d6ffd8aef481da8ea9b3835222d2dcd Mon Sep 17 00:00:00 2001
From: gaoxs <gaoxs@gaoxsdeMacBook-Pro.local>
Date: Mon, 6 Apr 2020 17:18:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B0=8F=E7=A8=8B=E5=BA=8F?=
 =?UTF-8?q?=E4=B8=8Eapp=E7=9A=84=E5=85=BC=E5=AE=B9=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                                   |    1 +
 api/order.js                              |   47 +-
 api/store.js                              |   78 +-
 api/user.js                               |  154 +-
 assets/css/style.less                     |   11 +-
 components/CouponListWindow.vue           |    2 +-
 components/DataFormat.vue                 |    8 +-
 components/DataFormatT.vue                |   10 +-
 libs/wechat.js                            |    3 +-
 main.js                                   |   10 +-
 manifest.json                             |   22 +-
 pages/Loading/index.vue                   |    2 +-
 pages/authorization/index.vue             |    7 +-
 pages/home/index.vue                      |    3 +-
 pages/order/MyOrder/index.vue             |    4 +-
 pages/order/OrderDetails/index.vue        |    4 +-
 pages/order/OrderSubmission/index.vue     |   31 +-
 pages/orderAdmin/AdminOrder/index.vue     |    4 +-
 pages/orderAdmin/AdminOrderList/index.vue |    2 +-
 pages/shop/GoodsClass/index.vue           |    1 -
 pages/shop/GoodsCon/index.vue             | 1619 ++++++++++-----------
 pages/shop/GoodsList/index.vue            |    1 -
 pages/shop/ShoppingCart/index.vue         |    1 -
 pages/user/Login/index.vue                |   28 +-
 pages/user/User/index.vue                 |   11 +-
 pages/user/coupon/GetCoupon/index.vue     |    4 +-
 pages/user/coupon/UserCoupon/index.vue    |    2 +-
 pages/user/promotion/Poster/index.vue     |  276 ++--
 pages/user/signIn/Integral/index.vue      |    2 +-
 utils/index.js                            |    6 +-
 utils/request.js                          |    4 +-
 31 files changed, 1257 insertions(+), 1101 deletions(-)

diff --git a/App.vue b/App.vue
index 9ebb9e8..31ec6d0 100644
--- a/App.vue
+++ b/App.vue
@@ -16,6 +16,7 @@
 	
 <style lang="less">
     /*每个页面公共css */
+	@import "animate.css";
 	@import "./assets/iconfont/iconfont.css";
 	@import "./assets/css/base.less";
 	@import "./assets/css/reset.less";
diff --git a/api/order.js b/api/order.js
index 33ad1a9..39d9e3d 100644
--- a/api/order.js
+++ b/api/order.js
@@ -9,7 +9,9 @@ import request from "@/utils/request";
  * @returns {*}
  */
 export function postOrderConfirm(cartId) {
-  return request.post("/order/confirm", { cartId });
+	return request.post("/order/confirm", {
+		cartId
+	});
 }
 
 /**
@@ -19,7 +21,7 @@ export function postOrderConfirm(cartId) {
  * @returns {*}
  */
 export function postOrderComputed(key, data) {
-  return request.post("/order/computed/" + key, data);
+	return request.post("/order/computed/" + key, data);
 }
 
 /**
@@ -28,7 +30,7 @@ export function postOrderComputed(key, data) {
  * @returns {*}
  */
 export function getOrderCoupon(price) {
-  return request.get("/coupons/order/" + (parseFloat(price) || 0));
+	return request.get("/coupons/order/" + (parseFloat(price) || 0));
 }
 
 /**
@@ -38,7 +40,7 @@ export function getOrderCoupon(price) {
  * @returns {*}
  */
 export function createOrder(key, data) {
-  return request.post("/order/create/" + key, data || {});
+	return request.post("/order/create/" + key, data || {});
 }
 
 /**
@@ -46,7 +48,7 @@ export function createOrder(key, data) {
  * @returns {*}
  */
 export function getOrderData() {
-  return request.get("/order/data");
+	return request.get("/order/data");
 }
 
 /**
@@ -54,7 +56,7 @@ export function getOrderData() {
  * @returns {*}
  */
 export function getOrderList(data) {
-  return request.get("/order/list", data);
+	return request.get("/order/list", data);
 }
 
 /**
@@ -62,7 +64,9 @@ export function getOrderList(data) {
  * @returns {*}
  */
 export function cancelOrder(id) {
-  return request.post("/order/cancel", { id });
+	return request.post("/order/cancel", {
+		id
+	});
 }
 
 /**
@@ -70,7 +74,7 @@ export function cancelOrder(id) {
  * @returns {*}
  */
 export function orderDetail(id) {
-  return request.get("/order/detail/" + id);
+	return request.get("/order/detail/" + id);
 }
 
 /**
@@ -78,7 +82,7 @@ export function orderDetail(id) {
  * @returns {*}
  */
 export function getRefundReason() {
-  return request.get("/order/refund/reason");
+	return request.get("/order/refund/reason");
 }
 
 /**
@@ -86,7 +90,7 @@ export function getRefundReason() {
  * @returns {*}
  */
 export function postOrderRefund(data) {
-  return request.post("/order/refund/verify", data);
+	return request.post("/order/refund/verify", data);
 }
 
 /**
@@ -94,7 +98,9 @@ export function postOrderRefund(data) {
  * @returns {*}
  */
 export function takeOrder(uni) {
-  return request.post("/order/take", { uni });
+	return request.post("/order/take", {
+		uni
+	});
 }
 
 /**
@@ -102,7 +108,9 @@ export function takeOrder(uni) {
  * @returns {*}
  */
 export function delOrder(uni) {
-  return request.post("/order/del", { uni });
+	return request.post("/order/del", {
+		uni
+	});
 }
 
 /**
@@ -110,7 +118,7 @@ export function delOrder(uni) {
  * @returns {*}
  */
 export function express(params) {
-  return request.post("order/express",params);
+	return request.post("order/express", params);
 }
 
 /**
@@ -118,12 +126,19 @@ export function express(params) {
  * @returns {*}
  */
 export function payOrder(uni, paytype, from) {
-  return request.post("order/pay", { uni, paytype, from });
+	return request.post("order/pay", {
+		uni,
+		paytype,
+		from
+	});
 }
 /**
  * 订单核销
  * @returns {*}
  */
 export function orderVerific(verify_code, is_confirm) {
-  return request.post("order/order_verific", { verify_code, is_confirm });
-}
+	return request.post("order/order_verific", {
+		verify_code,
+		is_confirm
+	});
+}
diff --git a/api/store.js b/api/store.js
index 62b584d..f238fb9 100644
--- a/api/store.js
+++ b/api/store.js
@@ -4,128 +4,158 @@ import request from "@/utils/request";
  * 商品分类
  * */
 export function getCategory() {
-  return request.get("/category", {}, { login: false });
+	return request.get("/category", {}, {
+		login: false
+	});
 }
 
 /*
  * 商品详情
  * */
-export function getProductDetail(id) {
-  return request.get("/product/detail/" + id, {}, { login: true });
+export function getProductDetail(id, data) {
+	return request.get("/product/detail/" + id, data, {
+		login: true
+	});
 }
 
 /*
  * 商品分销二维码
  * */
 export function getProductCode(id) {
-  return request.get("/product/code/" + id, {}, { login: true });
+	return request.get("/product/code/" + id, {}, {
+		login: true
+	});
 }
 
 /*
  * 商品列表
  * */
 export function getProducts(q) {
-  return request.get("/products", q, { login: false });
+	return request.get("/products", q, {
+		login: false
+	});
 }
 
 /*
  * 购物车数量
  * */
 export function getCartNum() {
-  return request.get("/cart/count");
+	return request.get("/cart/count");
 }
 
 /*
  * 添加收藏
  * */
 export function toCollect(id, category) {
-  return request.get("/collect/add/" + id + "/" + category);
+	return request.get("/collect/add/" + id + "/" + category);
 }
 
 /*
  * 为你推荐
  * */
 export function getHostProducts(page, limit) {
-  return request.get(
-    "/product/hot",
-    { page: page, limit: limit },
-    { login: false }
-  );
+	return request.get(
+		"/product/hot", {
+			page: page,
+			limit: limit
+		}, {
+			login: false
+		}
+	);
 }
 
 /*
  * 精品、热门、首发列表
  * */
 export function getGroomList(type) {
-  return request.get("/groom/list/" + type, {}, { login: false });
+	return request.get("/groom/list/" + type, {}, {
+		login: false
+	});
 }
 
 /*
  * 购物车 添加
  * */
 export function postCartAdd(data) {
-  return request.post("/cart/add", data);
+	return request.post("/cart/add", data);
 }
 
 /*
  * 购物车列表
  * */
 export function getCartList() {
-  return request.get("/cart/list");
+	return request.get("/cart/list");
 }
 
 /*
  * 购物车 删除
  * */
 export function postCartDel(ids) {
-  return request.post("/cart/del", { ids });
+	return request.post("/cart/del", {
+		ids
+	});
 }
 
 /*
  * 购物车 获取数量
  * */
 export function getCartCount(data) {
-  return request.get("/cart/count", data);
+	return request.get("/cart/count", data);
 }
 
 /*
  * 购物车 修改商品数量
  * */
 export function changeCartNum(id, number) {
-  return request.post("/cart/num", { id, number });
+	return request.post("/cart/num", {
+		id,
+		number
+	});
 }
 
 /**
  * 搜索推荐关键字
  */
 export function getSearchKeyword() {
-  return request.get("/search/keyword", {}, { login: false });
+	return request.get("/search/keyword", {}, {
+		login: false
+	});
 }
 
 /**
  * 产品评论列表
  */
 export function getReplyList(id, q) {
-  return request.get("/reply/list/" + id, q, { login: true });
+	return request.get("/reply/list/" + id, q, {
+		login: true
+	});
 }
 
 /**
  * 产品评价数量和好评度
  */
 export function getReplyConfig(id) {
-  return request.get("/reply/config/" + id, {}, { login: true });
+	return request.get("/reply/config/" + id, {}, {
+		login: true
+	});
 }
 
 /**
  * 评价页面获取单个产品详情
  */
 export function postOrderProduct(unique) {
-  return request.post("/order/product", { unique }, { login: true });
+	return request.post("/order/product", {
+		unique
+	}, {
+		login: true
+	});
 }
 
 /**
  * 提交评价页面；
  */
 export function postOrderComment(data) {
-  return request.post("/order/comment", data, { login: true });
-}
+	return request.post("/order/comment", data, {
+		login: true
+	});
+}
diff --git a/api/user.js b/api/user.js
index 8f70460..05c3e98 100644
--- a/api/user.js
+++ b/api/user.js
@@ -4,7 +4,9 @@ import request from "@/utils/request";
  * 省市区
  */
 export function district(data) {
-  return request.get("/citys", data, { login: false });
+	return request.get("/citys", data, {
+		login: false
+	});
 }
 
 /**
@@ -12,7 +14,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
+	});
 }
 
 /**
@@ -20,7 +24,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
+	});
 }
 
 /**
@@ -28,7 +34,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
+	});
 }
 
 /**
@@ -36,7 +44,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
+	});
 }
 
 /**
@@ -44,42 +54,52 @@ 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");
 }
 
 /*
@@ -87,7 +107,9 @@ export function getUser() {
  * */
 export function getUserInfo() {
 
-  return request.get("/userinfo", { login: true });
+	return request.get("/userinfo", {
+		login: true
+	});
 }
 
 /*
@@ -95,269 +117,295 @@ export function getUserInfo() {
  * */
 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) {
-  return request.get("/collect/user", { page: page, limit: limit });
+	return request.get("/collect/user", {
+		page: page,
+		limit: limit
+	});
 }
 
 /*
  * 删除收藏产品
  * */
 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() {
-  return request.get("/spread/banner");
+export function getSpreadImg(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("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");
+}
diff --git a/assets/css/style.less b/assets/css/style.less
index 6f3c06d..5c4efe8 100644
--- a/assets/css/style.less
+++ b/assets/css/style.less
@@ -1665,9 +1665,10 @@
 .index .wrapper .newProducts {}
 
 .index .wrapper.hot .newProducts .newProductsItem {
-  width: 2.4*100rpx;
+  width: 2.4*100rpx;
+  min-width: 2.4*100rpx;
   margin-right: 0.2*100rpx;
-
+flex: 0 2.4*100rpx;
 }
 
 .index .wrapper .newProducts .newProductsScroll {
@@ -1682,10 +1683,12 @@
 
 .index .wrapper .newProducts .newProductsItem {
   border: 1rpx solid #eee;
-  width: 2.4*100rpx;
+  width: 2.4*100rpx;
+  min-width: 2.4*100rpx;
   border-radius: 0.12*100rpx;
   overflow: hidden;
-  margin-right: .2*100rpx;
+  margin-right: .2*100rpx;
+  flex: 0  2.4*100rpx;
 }
 
 .index .wrapper .newProducts:nth-last-child(1) {}
diff --git a/components/CouponListWindow.vue b/components/CouponListWindow.vue
index 8651a13..1ad7b45 100644
--- a/components/CouponListWindow.vue
+++ b/components/CouponListWindow.vue
@@ -21,7 +21,7 @@
               <view class="condition line1">{{ coupon.couponTitle }}</view>
               <view class="data acea-row row-between-wrapper">
                 <view v-if="coupon.endTime === 0">不限时</view>
-                <view v-else><data-format-t :data="coupon.addTime"></data-format-t> - <data-format-t :data="coupon.endTime"></data-format-t></view>
+                <view v-else><data-format-t :date="coupon.addTime"></data-format-t> - <data-format-t :date="coupon.endTime"></data-format-t></view>
                 <view
                   class="iconfont icon-xuanzhong1 font-color-red"
                   v-if="checked === coupon.id"
diff --git a/components/DataFormat.vue b/components/DataFormat.vue
index 16e2034..d4355b0 100644
--- a/components/DataFormat.vue
+++ b/components/DataFormat.vue
@@ -6,18 +6,18 @@ import { dataFormat } from "@/utils";
 
 export default {
   name: "DataFormat",
-  props: ["data"],
+  props: ["date"],
   data: function() {
     return {
       time: ""
     };
   },
   mounted() {
-    this.time = dataFormat(this.data);
+    this.time = dataFormat(this.date);
   },
   watch: {
-    "$props.data"(props) {
-      this.time = dataFormat(this.data);
+    "$props.date"(props) {
+      this.time = dataFormat(this.date);
     }
   }
 };
diff --git a/components/DataFormatT.vue b/components/DataFormatT.vue
index 088f41b..55c33d4 100644
--- a/components/DataFormatT.vue
+++ b/components/DataFormatT.vue
@@ -2,22 +2,22 @@
   <text>{{time}}</text>
 </template>
 <script>
-import { dataFormatT } from "@/utils";
+import { dateFormatT } from "@/utils";
 
 export default {
   name: "DataFormatT",
-  props: ["data"],
+  props: ["date"],
   data: function() {
     return {
       time: ""
     };
   },
   mounted() {
-    this.time = dataFormatT(this.data);
+    this.time = dateFormatT(this.date);
   },
   watch: {
-    "$props.data"(props) {
-      this.time = dataFormatT(this.data);
+    "$props.date"(props) {
+      this.time = dateFormatT(this.date);
     }
   }
 };
diff --git a/libs/wechat.js b/libs/wechat.js
index 4acb0b4..d309588 100644
--- a/libs/wechat.js
+++ b/libs/wechat.js
@@ -1,7 +1,8 @@
 // 支付模块
 export const weappPay = (option) => {
   return new Promise((resolve, reject) => {
-    // 吊起微信支付
+    // 吊起微信支付
+	console.log(option,9999)
     uni.requestPayment({
       ...option,
       timeStamp: option.timeStamp + '',
diff --git a/main.js b/main.js
index 6409666..671b2b0 100644
--- a/main.js
+++ b/main.js
@@ -3,7 +3,6 @@ import App from './App'
 
 // import router from "./router";
 import store from "./store";
-import animate from "animate.css";
 import schema from "async-validator";
 import dialog from "./utils/dialog";
 import cookie from "@/utils/store/cookie";
@@ -25,7 +24,6 @@ import {
 	VUE_APP_API_URL
 } from "@/config";
 
-Vue.use(animate);
 Vue.config.productionTip = false;
 Vue.config.devtools = process.env.NODE_ENV !== "production";
 
@@ -82,24 +80,24 @@ Vue.prototype.$VUE_APP_API_URL = VUE_APP_API_URL
 
 // #ifdef H5
 // H5编译的代码
-Vue.prototype.$deviceType = 'H5'
+Vue.prototype.$deviceType = 'h5'
 // #endif
 
 // #ifdef APP-PLUS
 // App平台编译的代码
-Vue.prototype.$deviceType = 'App'
+Vue.prototype.$deviceType = 'app'
 Vue.prototype.$platform = uni.getSystemInfoSync().platform
 // #endif
 
 // #ifdef MP-WEIXIN
 // 微信小程序编译的代码
-Vue.prototype.$deviceType = 'Weixin'
+Vue.prototype.$deviceType = 'weixin'
 // #endif
 
 console.log(wx,121212)
 console.log(Vue.prototype.$deviceType)
 // if(wx){
-// 	Vue.prototype.$deviceType = 'Weixin'
+// 	Vue.prototype.$deviceType = 'weixin'
 // }
 
 app.$mount()
diff --git a/manifest.json b/manifest.json
index a168518..47ae761 100644
--- a/manifest.json
+++ b/manifest.json
@@ -54,7 +54,27 @@
             /* ios打包配置 */
             "ios" : {},
             /* SDK配置 */
-            "sdkConfigs" : {}
+            "sdkConfigs" : {
+                "oauth" : {
+                    "weixin" : {
+                        "appid" : "",
+                        "appsecret" : "",
+                        "UniversalLinks" : ""
+                    }
+                },
+                "payment" : {
+                    "weixin" : {
+                        "appid" : "",
+                        "UniversalLinks" : ""
+                    }
+                },
+                "share" : {
+                    "weixin" : {
+                        "appid" : "",
+                        "UniversalLinks" : ""
+                    }
+                }
+            }
         }
     },
     /* 快应用特有相关 */
diff --git a/pages/Loading/index.vue b/pages/Loading/index.vue
index 459101b..f910750 100644
--- a/pages/Loading/index.vue
+++ b/pages/Loading/index.vue
@@ -45,7 +45,7 @@ export default {
     console.log(this.$store.getters.userInfo, '获取store里面的 userInfo');
     cookie.get("spread");
     // this.toLaunch();
-    if (this.$deviceType == 'App') {
+    if (this.$deviceType == 'app') {
     	// this.toLaunch();
     	this.$yrouter.switchTab({
     		path: '/pages/home/index',
diff --git a/pages/authorization/index.vue b/pages/authorization/index.vue
index 97e44cd..f823cab 100644
--- a/pages/authorization/index.vue
+++ b/pages/authorization/index.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="container">
-		<view v-if="!$store.getters.token&&$deviceType=='Weixin'">
+		<view v-if="!$store.getters.token&&$deviceType=='weixin'">
 			<view class="getUserInfo">
 				<text>您还未允许微信登录授权，请点击下方按钮允许微信授权登录。</text>
 				<button type="primary" open-type="getUserInfo" @getuserinfo="getUserInfo">允许微信登录授权</button>
@@ -8,7 +8,7 @@
 				<button @click="back">取消微信登录授权</button>
 			</view>
 		</view>
-		<view v-if="!$store.getters.token&&$deviceType!='Weixin'">
+		<view v-if="!$store.getters.token&&$deviceType!='weixin'&&$deviceType=='app'">
 			<view class="getUserInfo">
 				<text>请先登录</text>
 				<button type="primary" @click="this.toLogin">去登录</button>
@@ -42,7 +42,8 @@
 		computed: {
 			...mapState(["isAuthorization"])
 		},
-		onShow() {
+		onShow() {
+			
 			this.UPDATE_AUTHORIZATIONPAGE(true);
 		},
 		onHide() {
diff --git a/pages/home/index.vue b/pages/home/index.vue
index 978d7b8..7d8b7c1 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -289,7 +289,8 @@ export default {
         query: { type }
       });
     },
-    goGoodsCon(item) {
+    goGoodsCon(item) {
+		console.log(item)
       this.$yrouter.push({
         path: "/pages/shop/GoodsCon/index",
         query: { id: item.id }
diff --git a/pages/order/MyOrder/index.vue b/pages/order/MyOrder/index.vue
index a609e43..5a72e3a 100644
--- a/pages/order/MyOrder/index.vue
+++ b/pages/order/MyOrder/index.vue
@@ -44,7 +44,7 @@
             >拼团</text>
             <text class="sign cart-color acea-row row-center-wrapper" v-if="order.seckillId > 0">秒杀</text>
             <text class="sign cart-color acea-row row-center-wrapper" v-if="order.bargainId > 0">砍价</text>
-            <data-format :data="order.addTime"></data-format>
+            <data-format :date="order.addTime"></data-format>
           </view>
           <view class="font-color-red">{{ getStatus(order) }}</view>
         </view>
@@ -209,7 +209,7 @@ export default {
       orderList: [],
       pay: false,
       payType: ["yue", "weixin"],
-      from: isWeixin() ? "weixin" : "weixinh5"
+      from: this.$deviceType
     };
   },
   components: {
diff --git a/pages/order/OrderDetails/index.vue b/pages/order/OrderDetails/index.vue
index 0d512a6..2ce4a9a 100644
--- a/pages/order/OrderDetails/index.vue
+++ b/pages/order/OrderDetails/index.vue
@@ -5,7 +5,7 @@
 			<view class="data" :class="refundOrder ? 'on' : ''">
 				<view class="state">{{ orderInfo._status._msg }}</view>
 				<view>
-					<data-format :data="orderInfo.addTime"></data-format>
+					<data-format :date="orderInfo.addTime"></data-format>
 				</view>
 			</view>
 		</view>
@@ -144,7 +144,7 @@
 			<view class="item acea-row row-between">
 				<view>下单时间：</view>
 				<view class="conter">
-					<data-format :data="orderInfo.addTime"></data-format>
+					<data-format :date="orderInfo.addTime"></data-format>
 				</view>
 			</view>
 			<view class="item acea-row row-between">
diff --git a/pages/order/OrderSubmission/index.vue b/pages/order/OrderSubmission/index.vue
index 7645acb..2a34030 100644
--- a/pages/order/OrderSubmission/index.vue
+++ b/pages/order/OrderSubmission/index.vue
@@ -481,6 +481,26 @@
 				uni.showLoading({
 					title: "生成订单中"
 				});
+				let form = {}
+				if (this.$deviceType == 'app') {
+					form.form = 'app'
+				}
+				console.log(this.orderGroupInfo.orderKey, {
+						realName: this.contacts,
+						phone: this.contactsTel,
+						addressId: this.addressInfo.id,
+						useIntegral: this.useIntegral ? 1 : 0,
+						couponId: this.usableCoupon.id || 0,
+						payType: this.active,
+						pinkId: this.pinkId,
+						seckillId: this.orderGroupInfo.seckill_id,
+						combinationId: this.orderGroupInfo.combination_id,
+						bargainId: this.orderGroupInfo.bargain_id,
+						from: this.from,
+						mark: this.mark || "",
+						shippingType: parseInt(shipping_type) + 1,
+						...form
+					})
 				createOrder(this.orderGroupInfo.orderKey, {
 						realName: this.contacts,
 						phone: this.contactsTel,
@@ -494,9 +514,11 @@
 						bargainId: this.orderGroupInfo.bargain_id,
 						from: this.from,
 						mark: this.mark || "",
-						shippingType: parseInt(shipping_type) + 1
+						shippingType: parseInt(shipping_type) + 1,
+						...form
 					})
-					.then(res => {
+					.then(res => {
+						console.log(res)
 						uni.hideLoading();
 						const data = res.data;
 						switch (data.status) {
@@ -541,7 +563,8 @@
 								}, 100);
 								break;
 							case "WECHAT_PAY":
-								weappPay(data.result.jsConfig).then(res => {
+								weappPay(data.result.jsConfig).then(res => {
+									console.log(res)
 									this.$yrouter.replace({
 										path: "/pages/order/OrderDetails/index",
 										query: {
@@ -569,4 +592,4 @@
 			}
 		}
 	};
-</script>
+</script>
diff --git a/pages/orderAdmin/AdminOrder/index.vue b/pages/orderAdmin/AdminOrder/index.vue
index 0aac9c9..25c8995 100644
--- a/pages/orderAdmin/AdminOrder/index.vue
+++ b/pages/orderAdmin/AdminOrder/index.vue
@@ -6,7 +6,7 @@
         <view class="order-num">订单：{{ orderInfo.orderId }}</view>
         <view>
           <text class="time">
-            <data-format :data="orderInfo.addTime"></data-format>
+            <data-format :date="orderInfo.addTime"></data-format>
           </text>
         </view>
       </view>
@@ -67,7 +67,7 @@
       <view class="item acea-row row-between">
         <view>下单时间：</view>
         <view class="conter">
-          <data-format :data="orderInfo.addTime"></data-format>
+          <data-format :date="orderInfo.addTime"></data-format>
         </view>
       </view>
       <view class="item acea-row row-between">
diff --git a/pages/orderAdmin/AdminOrderList/index.vue b/pages/orderAdmin/AdminOrderList/index.vue
index db4c4a7..bf9d82e 100644
--- a/pages/orderAdmin/AdminOrderList/index.vue
+++ b/pages/orderAdmin/AdminOrderList/index.vue
@@ -14,7 +14,7 @@
 					<text>订单号：{{ item.orderId }}</text>
 					<text class="time">
 						<text>下单时间：</text>
-						<data-format :data="item.addTime"></data-format>
+						<data-format :date="item.addTime"></data-format>
 					</text>
 				</view>
 				<view class="pos-order-goods" v-for="(val, key) in item.cartInfo" :key="key">
diff --git a/pages/shop/GoodsClass/index.vue b/pages/shop/GoodsClass/index.vue
index ff88aa6..281c445 100644
--- a/pages/shop/GoodsClass/index.vue
+++ b/pages/shop/GoodsClass/index.vue
@@ -47,7 +47,6 @@
   </view>
 </template>
 <script>
-import debounce from "lodash.debounce";
 import { getCategory } from "@/api/store";
 import { trim } from "@/utils";
 
diff --git a/pages/shop/GoodsCon/index.vue b/pages/shop/GoodsCon/index.vue
index 0fba924..d101de3 100644
--- a/pages/shop/GoodsCon/index.vue
+++ b/pages/shop/GoodsCon/index.vue
@@ -1,860 +1,847 @@
 <template>
-  <view :class="[posterImageStatus ? 'noscroll product-con' : 'product-con']">
-    <product-con-swiper :img-urls="storeInfo.sliderImageArr"></product-con-swiper>
-    <view class="wrapper">
-      <view class="share acea-row row-between row-bottom">
-        <view class="money font-color-red">
-          <text>￥</text>
-          <text class="num">{{ storeInfo.price }}</text>
-          <text
-            class="vip-money"
-            v-if="storeInfo.vipPrice && storeInfo.vipPrice > 0"
-          >￥{{ storeInfo.vipPrice }}</text>
-          <image
-            :src="$VUE_APP_RESOURCES_URL+'/images/vip.png'"
-            class="image"
-            v-if="storeInfo.vipPrice && storeInfo.vipPrice > 0"
-          />
-        </view>
-        <view class="iconfont icon-fenxiang" @click="listenerActionSheet"></view>
-      </view>
-      <view class="introduce">{{ storeInfo.storeName }}</view>
-      <view class="label acea-row row-between-wrapper">
-        <text>原价:￥{{ storeInfo.otPrice }}</text>
-        <text>库存:{{ storeInfo.stock }}{{ storeInfo.unitName }}</text>
-        <text>销量:{{ storeInfo.sales }}{{ storeInfo.unitName }}</text>
-      </view>
-      <view class="coupon acea-row row-between-wrapper" @click="couponTap" v-if="couponList.length">
-        <text class="hide line1 acea-row">
-          <text>优惠券：</text>
-          <text
-            class="activity"
-            v-for="(item, couponListEq) in couponList"
-            :key="couponListEq"
-          >满{{ item.use_min_price }}减{{ item.coupon_price }}</text>
-        </text>
-        <view class="iconfont icon-jiantou"></view>
-      </view>
-    </view>
-    <view class="attribute acea-row row-between-wrapper" @click="selecAttrTap">
-      <view>
-        <text>{{ attrTxt }}：</text>
-        <text class="atterTxt">{{ attrValue }}</text>
-      </view>
-      <view class="iconfont icon-jiantou"></view>
-    </view>
-    <view class="store-info" v-if="system_store.id !== undefined">
-      <text class="title">门店信息</text>
-      <view class="info acea-row row-between-wrapper">
-        <view class="picTxt acea-row row-between-wrapper">
-          <view class="pictrue">
-            <image :src="system_store.image" />
-          </view>
-          <view class="text">
-            <view class="name line1">{{ system_store.name }}</view>
-            <view class="address acea-row row-middle" @click="showChang">
-              <text class="addressTxt line1">{{system_store._detailed_address}}</text>
-              <text class="iconfont icon-youjian"></text>
-            </view>
-          </view>
-        </view>
-        <!-- <a class="iconfont icon-dadianhua01 font-color-red" :href="'tel:' + system_store.phone"></a> -->
-      </view>
-    </view>
-    <view class="userEvaluation" v-if="replyCount">
-      <view class="title acea-row row-between-wrapper">
-        <view>用户评价({{ replyCount }})</view>
-        <text @click="goEvaluateList(id)" class="praise">
-          <text class="font-color-red">{{ replyChance }}%</text>好评率
-          <text class="iconfont icon-jiantou"></text>
-        </text>
-      </view>
-      <user-evaluation :reply="reply"></user-evaluation>
-    </view>
-    <view class="superior">
-      <view class="title acea-row row-center-wrapper">
-        <image :src="$VUE_APP_RESOURCES_URL+'/images/ling.png'" />
-        <text class="titleTxt">优品推荐</text>
-        <image :src="$VUE_APP_RESOURCES_URL+'/images/ling.png'" />
-      </view>
-      <template>
-        <view class="slider-banner banner">
-          <swiper :options="swiperRecommend" v-if="goodList.length > 0">
-            <swiper-slide v-for="(item, eq2) in goodList" :key="eq2">
-              <view class="list acea-row row-middle">
-                <view class="item" v-for="val in item.list" :key="val.image">
-                  <view class="pictrue">
-                    <image :src="val.image" />
-                  </view>
-                  <view class="name line1">{{ val.store_name }}}</view>
-                  <view class="money font-color-red">¥{{ val.price }}</view>
-                </view>
-              </view>
-            </swiper-slide>
-            <view class="swiper-pagination" slot="pagination"></view>
-          </swiper>
-        </view>
-      </template>
-    </view>
-    <view class="product-intro">
-      <text class="title">产品介绍</text>
-      <view class="conter" v-html="storeInfo.description"></view>
-    </view>
-    <view style="height:100rpx;"></view>
-    <view class="footer acea-row row-between-wrapper">
-      <!--<view class="item" @click="goCustomerList()">-->
-      <!--<view class="iconfont icon-kefu"></view>-->
-      <!--<view>客服</view>-->
-      <!--</view>-->
-      <view class="item" @click="setCollect">
-        <view class="iconfont" :class="storeInfo.userCollect ? 'icon-shoucang1' : 'icon-shoucang'"></view>
-        <text>收藏</text>
-      </view>
-      <view
-        @click="goShoppingCart()"
-        class="item animated"
-        :class="animated === true ? 'bounceIn' : ''"
-      >
-        <view class="iconfont icon-gouwuche1">
-          <text class="num bg-color-red" v-if="CartCount > 0">{{CartCount}}</text>
-        </view>
-        <text>购物车</text>
-      </view>
-      <view class="bnt acea-row">
-        <view class="joinCart" @click="joinCart">
-          <text>加入购物车</text>
-        </view>
-        <view class="buy" @click="tapBuy">
-          <text>立即购买</text>
-        </view>
-      </view>
-    </view>
-    <CouponPop v-on:changeFun="changeFun" :coupon="coupon"></CouponPop>
-    <ProductWindow v-on:changeFun="changeFun" :attr="attr" :cartNum="cart_num"></ProductWindow>
-    <StorePoster
-      v-on:setPosterImageStatus="setPosterImageStatus"
-      :posterImageStatus="posterImageStatus"
-      :posterData="posterData"
-    ></StorePoster>
-    <ShareInfo v-on:setShareInfoStatus="setShareInfoStatus" :shareInfoStatus="shareInfoStatus"></ShareInfo>
-    <view class="generate-posters acea-row row-middle" :class="posters ? 'on' : ''">
-      <view class="item" v-if="weixinStatus === true" @click="setShareInfoStatus">
-        <view class="iconfont icon-weixin3"></view>
-        <view class>发送给朋友</view>
-      </view>
-      <view class="item" @click="setPosterImageStatus">
-        <view class="iconfont icon-haibao"></view>
-        <view class>生成海报</view>
-      </view>
-    </view>
-    <view class="mask" @touchmove.prevent @click="listenerActionClose" v-show="posters"></view>
-    <view class="geoPage" v-if="mapShow">
-      <iframe
-        width="100%"
-        height="100%"
-        frameborder="0"
-        scrolling="no"
-        :src="'https://apis.map.qq.com/uri/v1/geocoder?coord=' +system_store.latitude +',' +system_store.longitude +'&referer=' +mapKey"
-      ></iframe>
-    </view>
-  </view>
+	<view :class="[posterImageStatus ? 'noscroll product-con' : 'product-con']">
+		<product-con-swiper :img-urls="storeInfo.sliderImageArr"></product-con-swiper>
+		<view class="wrapper">
+			<view class="share acea-row row-between row-bottom">
+				<view class="money font-color-red">
+					<text>￥</text>
+					<text class="num">{{ storeInfo.price }}</text>
+					<text class="vip-money" v-if="storeInfo.vipPrice && storeInfo.vipPrice > 0">￥{{ storeInfo.vipPrice }}</text>
+					<image :src="$VUE_APP_RESOURCES_URL+'/images/vip.png'" class="image" v-if="storeInfo.vipPrice && storeInfo.vipPrice > 0" />
+				</view>
+				<view class="iconfont icon-fenxiang" @click="listenerActionSheet"></view>
+			</view>
+			<view class="introduce">{{ storeInfo.storeName }}</view>
+			<view class="label acea-row row-between-wrapper">
+				<text>原价:￥{{ storeInfo.otPrice }}</text>
+				<text>库存:{{ storeInfo.stock }}{{ storeInfo.unitName }}</text>
+				<text>销量:{{ storeInfo.sales }}{{ storeInfo.unitName }}</text>
+			</view>
+			<view class="coupon acea-row row-between-wrapper" @click="couponTap" v-if="couponList.length">
+				<text class="hide line1 acea-row">
+					<text>优惠券：</text>
+					<text class="activity" v-for="(item, couponListEq) in couponList" :key="couponListEq">满{{ item.use_min_price }}减{{ item.coupon_price }}</text>
+				</text>
+				<view class="iconfont icon-jiantou"></view>
+			</view>
+		</view>
+		<view class="attribute acea-row row-between-wrapper" @click="selecAttrTap">
+			<view>
+				<text>{{ attrTxt }}：</text>
+				<text class="atterTxt">{{ attrValue }}</text>
+			</view>
+			<view class="iconfont icon-jiantou"></view>
+		</view>
+		<view class="store-info" v-if="system_store.id !== undefined">
+			<text class="title">门店信息</text>
+			<view class="info acea-row row-between-wrapper">
+				<view class="picTxt acea-row row-between-wrapper">
+					<view class="pictrue">
+						<image :src="system_store.image" />
+					</view>
+					<view class="text">
+						<view class="name line1">{{ system_store.name }}</view>
+						<view class="address acea-row row-middle" @click="showChang">
+							<text class="addressTxt line1">{{system_store._detailed_address}}</text>
+							<text class="iconfont icon-youjian"></text>
+						</view>
+					</view>
+				</view>
+				<!-- <a class="iconfont icon-dadianhua01 font-color-red" :href="'tel:' + system_store.phone"></a> -->
+			</view>
+		</view>
+		<view class="userEvaluation" v-if="replyCount">
+			<view class="title acea-row row-between-wrapper">
+				<view>用户评价({{ replyCount }})</view>
+				<text @click="goEvaluateList(id)" class="praise">
+					<text class="font-color-red">{{ replyChance }}%</text>好评率
+					<text class="iconfont icon-jiantou"></text>
+				</text>
+			</view>
+			<user-evaluation :reply="reply"></user-evaluation>
+		</view>
+		<view class="superior">
+			<view class="title acea-row row-center-wrapper">
+				<image :src="$VUE_APP_RESOURCES_URL+'/images/ling.png'" />
+				<text class="titleTxt">优品推荐</text>
+				<image :src="$VUE_APP_RESOURCES_URL+'/images/ling.png'" />
+			</view>
+			<template>
+				<view class="slider-banner banner">
+					<swiper :options="swiperRecommend" v-if="goodList.length > 0">
+						<swiper-slide v-for="(item, eq2) in goodList" :key="eq2">
+							<view class="list acea-row row-middle">
+								<view class="item" v-for="val in item.list" :key="val.image">
+									<view class="pictrue">
+										<image :src="val.image" />
+									</view>
+									<view class="name line1">{{ val.store_name }}}</view>
+									<view class="money font-color-red">¥{{ val.price }}</view>
+								</view>
+							</view>
+						</swiper-slide>
+						<view class="swiper-pagination" slot="pagination"></view>
+					</swiper>
+				</view>
+			</template>
+		</view>
+		<view class="product-intro">
+			<text class="title">产品介绍</text>
+			<view class="conter" v-html="storeInfo.description"></view>
+		</view>
+		<view style="height:100rpx;"></view>
+		<view class="footer acea-row row-between-wrapper">
+			<!--<view class="item" @click="goCustomerList()">-->
+			<!--<view class="iconfont icon-kefu"></view>-->
+			<!--<view>客服</view>-->
+			<!--</view>-->
+			<view class="item" @click="setCollect">
+				<view class="iconfont" :class="storeInfo.userCollect ? 'icon-shoucang1' : 'icon-shoucang'"></view>
+				<text>收藏</text>
+			</view>
+			<view @click="goShoppingCart()" class="item animated" :class="animated === true ? 'bounceIn' : ''">
+				<view class="iconfont icon-gouwuche1">
+					<text class="num bg-color-red" v-if="CartCount > 0">{{CartCount}}</text>
+				</view>
+				<text>购物车</text>
+			</view>
+			<view class="bnt acea-row">
+				<view class="joinCart" @click="joinCart">
+					<text>加入购物车</text>
+				</view>
+				<view class="buy" @click="tapBuy">
+					<text>立即购买</text>
+				</view>
+			</view>
+		</view>
+		<CouponPop v-on:changeFun="changeFun" :coupon="coupon"></CouponPop>
+		<ProductWindow v-on:changeFun="changeFun" :attr="attr" :cartNum="cart_num"></ProductWindow>
+		<StorePoster v-on:setPosterImageStatus="setPosterImageStatus" :posterImageStatus="posterImageStatus" :posterData="posterData"></StorePoster>
+		<ShareInfo v-on:setShareInfoStatus="setShareInfoStatus" :shareInfoStatus="shareInfoStatus"></ShareInfo>
+		<view class="generate-posters acea-row row-middle" :class="posters ? 'on' : ''">
+			<view class="item" v-if="weixinStatus === true" @click="setShareInfoStatus">
+				<view class="iconfont icon-weixin3"></view>
+				<view class>发送给朋友</view>
+			</view>
+			<view class="item" @click="setPosterImageStatus">
+				<view class="iconfont icon-haibao"></view>
+				<view class>生成海报</view>
+			</view>
+		</view>
+		<view class="mask" @touchmove.prevent @click="listenerActionClose" v-show="posters"></view>
+		<view class="geoPage" v-if="mapShow">
+			<iframe width="100%" height="100%" frameborder="0" scrolling="no" :src="'https://apis.map.qq.com/uri/v1/geocoder?coord=' +system_store.latitude +',' +system_store.longitude +'&referer=' +mapKey"></iframe>
+		</view>
+	</view>
 </template>
 
 <script>
-// import { swiper, swiperSlide } from "vue-awesome-swiper";
+	// import { swiper, swiperSlide } from "vue-awesome-swiper";
 
-import ProductConSwiper from "@/components/ProductConSwiper";
-import UserEvaluation from "@/components/UserEvaluation";
-import CouponPop from "@/components/CouponPop";
-import ProductWindow from "@/components/ProductWindow";
-import StorePoster from "@/components/StorePoster";
-import ShareInfo from "@/components/ShareInfo";
-import {
-  getProductDetail,
-  postCartAdd,
-  getCartCount,
-  getProductCode
-} from "@/api/store";
-import {
-  getCoupon,
-  getCollectAdd,
-  getCollectDel,
-  getUserInfo
-} from "@/api/user";
-import { isWeixin, PosterCanvas, handleQrCode } from "@/utils";
-// import { wechatEvevt } from "@/libs/wechat";
-import { imageBase64 } from "@/api/public";
-import { mapGetters } from "vuex";
+	import ProductConSwiper from "@/components/ProductConSwiper";
+	import UserEvaluation from "@/components/UserEvaluation";
+	import CouponPop from "@/components/CouponPop";
+	import ProductWindow from "@/components/ProductWindow";
+	import StorePoster from "@/components/StorePoster";
+	import ShareInfo from "@/components/ShareInfo";
+	import {
+		getProductDetail,
+		postCartAdd,
+		getCartCount,
+		getProductCode
+	} from "@/api/store";
+	import {
+		getCoupon,
+		getCollectAdd,
+		getCollectDel,
+		getUserInfo
+	} from "@/api/user";
+	import {
+		isWeixin,
+		PosterCanvas,
+		handleQrCode
+	} from "@/utils";
+	// import { wechatEvevt } from "@/libs/wechat";
+	import {
+		imageBase64
+	} from "@/api/public";
+	import {
+		mapGetters
+	} from "vuex";
 
-export default {
-  name: "GoodsCon",
-  components: {
-    // swiper,
-    // swiperSlide,
-    ProductConSwiper,
-    UserEvaluation,
-    CouponPop,
-    ProductWindow,
-    StorePoster,
-    ShareInfo
-  },
-  data: function() {
-    return {
-      shareInfoStatus: false,
-      weixinStatus: false,
-      mapShow: false,
-      mapKey: "",
-      posterData: {
-        image: "",
-        title: "",
-        price: "",
-        code: ""
-      },
-      posterImageStatus: false,
-      animated: false,
-      coupon: {
-        coupon: false,
-        list: []
-      },
-      attr: {
-        cartAttr: false,
-        productAttr: [],
-        productSelect: {}
-      },
-      isOpen: false, //是否打开属性组件
-      productValue: [],
-      id: 0,
-      storeInfo: {},
-      couponList: [],
-      attrTxt: "请选择",
-      attrValue: "",
-      cart_num: 1, //购买数量
-      replyCount: "",
-      replyChance: "",
-      reply: [],
-      priceName: 0,
-      CartCount: 0,
-      posters: false,
-      banner: [{}, {}],
-      swiperRecommend: {
-        pagination: {
-          el: ".swiper-pagination",
-          clickable: true
-        },
-        autoplay: false,
-        loop: false,
-        speed: 1000,
-        observer: true,
-        observeParents: true
-      },
-      goodList: [],
-      system_store: {},
-      qqmapsdk: null
-    };
-  },
-  computed: mapGetters(["isLogin"]),
-  mounted: function() {
-    let url = handleQrCode();
-    console.log(url);
-    if (url && url.productId) {
-      this.id = url.productId;
-    } else {
-      this.id = this.$yroute.query.id;
-    }
-    this.productCon();
-  },
-  methods: {
-    goShoppingCart() {
-      this.$yrouter.switchTab("/pages/shop/ShoppingCart/index");
-    },
-    goCustomerList() {
-      this.$yrouter.push({
-        path: "/pages/user/CustomerList/index"
-      });
-    },
-    goEvaluateList(id) {
-      this.$yrouter.push({
-        path: "/pages/shop/EvaluateList/index",
-        query: {
-          id
-        }
-      });
-    },
-    showChang: function() {
-      if (isWeixin()) {
-        let config = {
-          latitude: this.system_store.latitude,
-          longitude: this.system_store.longitude,
-          name: this.system_store.name,
-          address: this.system_store._detailed_address
-        };
-      } else {
-        if (!this.mapKey) {
-          uni.showToast({
-            title: "暂无法使用查看地图，请配置您的腾讯地图key",
-            icon: "none",
-            duration: 2000
-          });
-          return;
-        }
-        this.mapShow = true;
-      }
-    },
-    updateTitle() {
-      // document.title = this.storeInfo.storeName || this.$yroute.meta.title;
-    },
-    setShareInfoStatus: function() {
-      this.shareInfoStatus = !this.shareInfoStatus;
-      this.posters = false;
-    },
-    shareCode: function() {
-      var that = this;
-      getProductCode(that.id).then(res => {
-        that.posterData.code = res.data.code;
-        that.listenerActionSheet();
-      });
-    },
-    setPosterImageStatus: function() {
-      this.posterImageStatus = !this.posterImageStatus;
-      this.posters = false;
-    },
-    //产品详情接口；
-    productCon: function() {
-      let that = this;
-      getProductDetail(that.id)
-        .then(res => {
-          that.$set(that, "storeInfo", res.data.storeInfo);
-          that.$set(that.attr, "productAttr", res.data.productAttr);
-          that.$set(that, "productValue", res.data.productValue);
-          that.$set(that, "replyCount", res.data.replyCount);
-          that.$set(that, "replyChance", res.data.replyChance);
-          that.reply = res.data.reply ? [res.data.reply] : [];
-          that.$set(that, "reply", that.reply);
-          that.$set(that, "priceName", res.data.priceName);
-          that.posterData.image = that.storeInfo.image;
-          if (that.storeInfo.storeName.length > 30) {
-            that.posterData.title =
-              that.storeInfo.storeName.substring(0, 30) + "...";
-          } else {
-            that.posterData.title = that.storeInfo.storeName;
-          }
-          that.posterData.price = that.storeInfo.price;
-          that.posterData.code = that.storeInfo.codeBase;
-          // that.system_store = res.data.system_store;
-          let good_list = res.data.goodList || [];
-          let goodArray = [];
-          let count = Math.ceil(good_list.length / 6);
-          for (let i = 0; i < count; i++) {
-            var list = good_list.slice(i * 6, 6);
-            if (list.length)
-              goodArray.push({
-                list: list
-              });
-          }
-          that.mapKay = res.data.mapKay;
-          that.$set(that, "goodList", goodArray);
-          that.updateTitle();
-          that.DefaultSelect();
-          that.getCartCount();
-        })
-        .catch(res => {
-          uni.showToast({
-            title: res.msg,
-            icon: "none",
-            duration: 2000
-          });
-        });
-    },
-    //默认选中属性；
-    DefaultSelect: function() {
-      let productAttr = this.attr.productAttr;
-      let value = [];
-      for (let i = 0; i < productAttr.length; i++) {
-        this.$set(productAttr[i], "index", 0);
-        value.push(productAttr[i].attrValueArr[0]);
-      }
-      //sort();排序函数:数字-英文-汉字；
-      let productSelect = this.productValue[value.sort().join(",")];
-      if (productSelect && productAttr.length) {
-        this.$set(
-          this.attr.productSelect,
-          "store_name",
-          this.storeInfo.storeName
-        );
-        this.$set(this.attr.productSelect, "image", productSelect.image);
-        this.$set(this.attr.productSelect, "price", productSelect.price);
-        this.$set(this.attr.productSelect, "stock", productSelect.stock);
-        this.$set(this.attr.productSelect, "unique", productSelect.unique);
-        this.$set(this.attr.productSelect, "cart_num", 1);
-        this.$set(this, "attrValue", value.sort().join(","));
-        this.$set(this, "attrTxt", "已选择");
-      } else if (!productSelect && productAttr.length) {
-        this.$set(
-          this.attr.productSelect,
-          "store_name",
-          this.storeInfo.storeName
-        );
-        this.$set(this.attr.productSelect, "image", this.storeInfo.image);
-        this.$set(this.attr.productSelect, "price", this.storeInfo.price);
-        this.$set(this.attr.productSelect, "stock", 0);
-        this.$set(this.attr.productSelect, "unique", "");
-        this.$set(this.attr.productSelect, "cart_num", 0);
-        this.$set(this, "attrValue", "");
-        this.$set(this, "attrTxt", "请选择");
-      } else if (!productSelect && !productAttr.length) {
-        this.$set(
-          this.attr.productSelect,
-          "store_name",
-          this.storeInfo.storeName
-        );
-        this.$set(this.attr.productSelect, "image", this.storeInfo.image);
-        this.$set(this.attr.productSelect, "price", this.storeInfo.price);
-        this.$set(this.attr.productSelect, "stock", this.storeInfo.stock);
-        this.$set(
-          this.attr.productSelect,
-          "unique",
-          this.storeInfo.unique || ""
-        );
-        this.$set(this.attr.productSelect, "cart_num", 1);
-        this.$set(this, "attrValue", "");
-        this.$set(this, "attrTxt", "请选择");
-      }
-    },
-    //购物车；
-    ChangeCartNum: function(changeValue) {
-      //changeValue:是否 加|减
-      //获取当前变动属性
-      let productSelect = this.productValue[this.attrValue];
-      //如果没有属性,赋值给商品默认库存
-      if (productSelect === undefined && !this.attr.productAttr.length) {
-        productSelect = this.attr.productSelect;
-      }
-      //无属性值即库存为0；不存在加减；
-      if (productSelect === undefined) return;
-      let stock = productSelect.stock || 0;
-      let num = this.attr.productSelect;
-      if (changeValue) {
-        num.cart_num++;
-        if (num.cart_num > stock) {
-          this.$set(this.attr.productSelect, "cart_num", stock);
-          this.$set(this, "cart_num", stock);
-        } else {
-          this.$set(this.attr.productSelect, "cart_num", num.cart_num);
-          this.$set(this, "cart_num", num.cart_num);
-        }
-      } else {
-        num.cart_num--;
-        if (num.cart_num < 1) {
-          this.$set(this.attr.productSelect, "cart_num", 1);
-          this.$set(this, "cart_num", 1);
-        }
-      }
-    },
-    //将父级向子集多次传送的函数合二为一；
-    changeFun: function(opt) {
-      if (typeof opt !== "object") opt = {};
-      let action = opt.action || "";
-      let value = opt.value === undefined ? "" : opt.value;
-      this[action] && this[action](value);
-    },
-    //打开优惠券插件；
-    couponTap: function() {
-      let that = this;
-      that.coupons();
-      that.coupon.coupon = true;
-    },
-    changecoupon: function(msg) {
-      this.coupon.coupon = msg;
-      this.coupons();
-    },
-    currentcoupon: function(res) {
-      let that = this;
-      that.coupon.coupon = false;
-      that.$set(that.coupon.list[res], "is_use", true);
-    },
-    //可领取优惠券接口；
-    coupons: function() {
-      let that = this,
-        q = {
-          page: 1,
-          limit: 20
-        };
-      getCoupon(q).then(res => {
-        that.$set(that, "couponList", res.data || []);
-        that.$set(that.coupon, "list", res.data);
-      });
-    },
-    //打开属性插件；
-    selecAttrTap: function() {
-      this.attr.cartAttr = true;
-      this.isOpen = true;
-    },
-    changeattr: function(msg) {
-      this.attr.cartAttr = msg;
-      console.log(this.attr, msg);
-      this.isOpen = false;
-    },
-    //选择属性；
-    ChangeAttr: function(res) {
-      let productSelectValue = this.productValue[res];
-      if (productSelectValue) {
-        let productSelect = {
-          ...this.attr.productSelect,
-          image: productSelectValue.image,
-          price: productSelectValue.price,
-          stock: productSelectValue.stock,
-          unique: productSelectValue.unique,
-          cart_num: 1
-        };
-        let attr = {
-          ...this.attr,
-          productSelect
-        };
-        this.attr = attr;
-        // this.$set(this.attr.productSelect, "image", productSelect.image);
-        // this.$set(this.attr.productSelect, "price", productSelect.price);
-        // this.$set(this.attr.productSelect, "stock", productSelect.stock);
-        // this.$set(this.attr.productSelect, "unique", productSelect.unique);
-        // this.$set(this.attr.productSelect, "cart_num", 1);
-        this.$set(this, "attrValue", res);
-        this.$set(this, "attrTxt", "已选择");
-      } else {
-        this.$set(this.attr.productSelect, "image", this.storeInfo.image);
-        this.$set(this.attr.productSelect, "price", this.storeInfo.price);
-        this.$set(this.attr.productSelect, "stock", 0);
-        this.$set(this.attr.productSelect, "unique", "");
-        this.$set(this.attr.productSelect, "cart_num", 0);
-        this.$set(this, "attrValue", "");
-        this.$set(this, "attrTxt", "请选择");
-      }
-    },
-    //收藏商品
-    setCollect: function() {
-      let that = this,
-        id = that.storeInfo.id,
-        category = "product";
-      if (that.storeInfo.userCollect) {
-        getCollectDel(id, category).then(function() {
-          that.storeInfo.userCollect = !that.storeInfo.userCollect;
-        });
-      } else {
-        getCollectAdd(id, category).then(function() {
-          that.storeInfo.userCollect = !that.storeInfo.userCollect;
-        });
-      }
-    },
-    //  点击加入购物车按钮
-    joinCart: function() {
-      //0=加入购物车
-      this.goCat(0);
-    },
-    // 加入购物车；
-    goCat: function(news) {
-      let that = this,
-        productSelect = that.productValue[this.attrValue];
-      //打开属性
-      if (that.attrValue) {
-        //默认选中了属性，但是没有打开过属性弹窗还是自动打开让用户查看默认选中的属性
-        that.attr.cartAttr = !that.isOpen ? true : false;
-      } else {
-        if (that.isOpen) that.attr.cartAttr = true;
-        else that.attr.cartAttr = !that.attr.cartAttr;
-      }
-      //只有关闭属性弹窗时进行加入购物车
-      if (that.attr.cartAttr === true && that.isOpen === false)
-        return (that.isOpen = true);
-      //如果有属性,没有选择,提示用户选择
-      if (
-        that.attr.productAttr.length &&
-        productSelect === undefined &&
-        that.isOpen === true
-      ) {
-        uni.showToast({
-          title: "产品库存不足，请选择其它",
-          icon: "none",
-          duration: 2000
-        });
-        return;
-      }
-      let q = {
-        productId: that.id,
-        cartNum: that.attr.productSelect.cart_num,
-        new: news,
-        uniqueId:
-          that.attr.productSelect !== undefined
-            ? that.attr.productSelect.unique
-            : ""
-      };
-      postCartAdd(q)
-        .then(function(res) {
-          that.isOpen = false;
-          that.attr.cartAttr = false;
-          if (news) {
-            that.$yrouter.push({
-              path: "/pages/order/OrderSubmission/index",
-              query: {
-                id: res.data.cartId
-              }
-            });
-          } else {
-            uni.showToast({
-              title: "添加购物车成功",
-              icon: "success",
-              duration: 2000,
-              complete: () => {
-                that.getCartCount(true);
-              }
-            });
-          }
-        })
-        .catch(error => {
-          that.isOpen = false;
-          uni.showToast({
-            title: error.response.data.msg,
-            icon: "none",
-            duration: 2000
-          });
-        });
-    },
-    //获取购物车数量
-    getCartCount: function(isAnima) {
-      let that = this;
-      const isLogin = that.isLogin;
-      if (isLogin) {
-        getCartCount({
-          numType: 0
-        }).then(res => {
-          that.CartCount = res.data.count;
-          //加入购物车后重置属性
-          if (isAnima) {
-            that.animated = true;
-            setTimeout(function() {
-              that.animated = false;
-            }, 500);
-          }
-        });
-      }
-    },
-    //立即购买；
-    tapBuy: function() {
-      //  1=直接购买
-      this.goCat(1);
-    },
-    listenerActionSheet: function() {
-      if (isWeixin() === true) {
-        this.weixinStatus = true;
-      }
-      this.posters = true;
-    },
-    listenerActionClose: function() {
-      this.posters = false;
-    }
-  }
-};
+	export default {
+		name: "GoodsCon",
+		components: {
+			// swiper,
+			// swiperSlide,
+			ProductConSwiper,
+			UserEvaluation,
+			CouponPop,
+			ProductWindow,
+			StorePoster,
+			ShareInfo
+		},
+		data: function() {
+			return {
+				shareInfoStatus: false,
+				weixinStatus: false,
+				mapShow: false,
+				mapKey: "",
+				posterData: {
+					image: "",
+					title: "",
+					price: "",
+					code: ""
+				},
+				posterImageStatus: false,
+				animated: false,
+				coupon: {
+					coupon: false,
+					list: []
+				},
+				attr: {
+					cartAttr: false,
+					productAttr: [],
+					productSelect: {}
+				},
+				isOpen: false, //是否打开属性组件
+				productValue: [],
+				id: 0,
+				storeInfo: {},
+				couponList: [],
+				attrTxt: "请选择",
+				attrValue: "",
+				cart_num: 1, //购买数量
+				replyCount: "",
+				replyChance: "",
+				reply: [],
+				priceName: 0,
+				CartCount: 0,
+				posters: false,
+				banner: [{}, {}],
+				swiperRecommend: {
+					pagination: {
+						el: ".swiper-pagination",
+						clickable: true
+					},
+					autoplay: false,
+					loop: false,
+					speed: 1000,
+					observer: true,
+					observeParents: true
+				},
+				goodList: [],
+				system_store: {},
+				qqmapsdk: null
+			};
+		},
+		computed: mapGetters(["isLogin"]),
+		mounted: function() {
+			console.log(this)
+			let url = handleQrCode();
+			console.log(url);
+			if (url && url.productId) {
+				this.id = url.productId;
+			} else {
+				this.id = this._route.query.id;
+			}
+			this.productCon();
+		},
+		methods: {
+			goShoppingCart() {
+				this.$yrouter.switchTab("/pages/shop/ShoppingCart/index");
+			},
+			goCustomerList() {
+				this.$yrouter.push({
+					path: "/pages/user/CustomerList/index"
+				});
+			},
+			goEvaluateList(id) {
+				this.$yrouter.push({
+					path: "/pages/shop/EvaluateList/index",
+					query: {
+						id
+					}
+				});
+			},
+			showChang: function() {
+				if (isWeixin()) {
+					let config = {
+						latitude: this.system_store.latitude,
+						longitude: this.system_store.longitude,
+						name: this.system_store.name,
+						address: this.system_store._detailed_address
+					};
+				} else {
+					if (!this.mapKey) {
+						uni.showToast({
+							title: "暂无法使用查看地图，请配置您的腾讯地图key",
+							icon: "none",
+							duration: 2000
+						});
+						return;
+					}
+					this.mapShow = true;
+				}
+			},
+			updateTitle() {
+				// document.title = this.storeInfo.storeName || this.$yroute.meta.title;
+			},
+			setShareInfoStatus: function() {
+				this.shareInfoStatus = !this.shareInfoStatus;
+				this.posters = false;
+			},
+			shareCode: function() {
+				var that = this;
+				getProductCode(that.id).then(res => {
+					that.posterData.code = res.data.code;
+					that.listenerActionSheet();
+				});
+			},
+			setPosterImageStatus: function() {
+				this.posterImageStatus = !this.posterImageStatus;
+				this.posters = false;
+			},
+			//产品详情接口；
+			productCon: function() {
+				let that = this;
+				let form = {}
+				if (this.$deviceType == 'app') {
+					form.form = 'app'
+				}
+				console.log(form, 2222)
+				getProductDetail(that.id, form)
+					.then(res => {
+						that.$set(that, "storeInfo", res.data.storeInfo);
+						that.$set(that.attr, "productAttr", res.data.productAttr);
+						that.$set(that, "productValue", res.data.productValue);
+						that.$set(that, "replyCount", res.data.replyCount);
+						that.$set(that, "replyChance", res.data.replyChance);
+						that.reply = res.data.reply ? [res.data.reply] : [];
+						that.$set(that, "reply", that.reply);
+						that.$set(that, "priceName", res.data.priceName);
+						that.posterData.image = that.storeInfo.image;
+						if (that.storeInfo.storeName.length > 30) {
+							that.posterData.title =
+								that.storeInfo.storeName.substring(0, 30) + "...";
+						} else {
+							that.posterData.title = that.storeInfo.storeName;
+						}
+						that.posterData.price = that.storeInfo.price;
+						that.posterData.code = that.storeInfo.codeBase;
+						// that.system_store = res.data.system_store;
+						let good_list = res.data.goodList || [];
+						let goodArray = [];
+						let count = Math.ceil(good_list.length / 6);
+						for (let i = 0; i < count; i++) {
+							var list = good_list.slice(i * 6, 6);
+							if (list.length)
+								goodArray.push({
+									list: list
+								});
+						}
+						that.mapKay = res.data.mapKay;
+						that.$set(that, "goodList", goodArray);
+						that.updateTitle();
+						that.DefaultSelect();
+						that.getCartCount();
+					})
+					.catch(res => {
+						uni.showToast({
+							title: res.msg,
+							icon: "none",
+							duration: 2000
+						});
+					});
+			},
+			//默认选中属性；
+			DefaultSelect: function() {
+				let productAttr = this.attr.productAttr;
+				let value = [];
+				for (let i = 0; i < productAttr.length; i++) {
+					this.$set(productAttr[i], "index", 0);
+					value.push(productAttr[i].attrValueArr[0]);
+				}
+				//sort();排序函数:数字-英文-汉字；
+				let productSelect = this.productValue[value.sort().join(",")];
+				if (productSelect && productAttr.length) {
+					this.$set(
+						this.attr.productSelect,
+						"store_name",
+						this.storeInfo.storeName
+					);
+					this.$set(this.attr.productSelect, "image", productSelect.image);
+					this.$set(this.attr.productSelect, "price", productSelect.price);
+					this.$set(this.attr.productSelect, "stock", productSelect.stock);
+					this.$set(this.attr.productSelect, "unique", productSelect.unique);
+					this.$set(this.attr.productSelect, "cart_num", 1);
+					this.$set(this, "attrValue", value.sort().join(","));
+					this.$set(this, "attrTxt", "已选择");
+				} else if (!productSelect && productAttr.length) {
+					this.$set(
+						this.attr.productSelect,
+						"store_name",
+						this.storeInfo.storeName
+					);
+					this.$set(this.attr.productSelect, "image", this.storeInfo.image);
+					this.$set(this.attr.productSelect, "price", this.storeInfo.price);
+					this.$set(this.attr.productSelect, "stock", 0);
+					this.$set(this.attr.productSelect, "unique", "");
+					this.$set(this.attr.productSelect, "cart_num", 0);
+					this.$set(this, "attrValue", "");
+					this.$set(this, "attrTxt", "请选择");
+				} else if (!productSelect && !productAttr.length) {
+					this.$set(
+						this.attr.productSelect,
+						"store_name",
+						this.storeInfo.storeName
+					);
+					this.$set(this.attr.productSelect, "image", this.storeInfo.image);
+					this.$set(this.attr.productSelect, "price", this.storeInfo.price);
+					this.$set(this.attr.productSelect, "stock", this.storeInfo.stock);
+					this.$set(
+						this.attr.productSelect,
+						"unique",
+						this.storeInfo.unique || ""
+					);
+					this.$set(this.attr.productSelect, "cart_num", 1);
+					this.$set(this, "attrValue", "");
+					this.$set(this, "attrTxt", "请选择");
+				}
+			},
+			//购物车；
+			ChangeCartNum: function(changeValue) {
+				//changeValue:是否 加|减
+				//获取当前变动属性
+				let productSelect = this.productValue[this.attrValue];
+				//如果没有属性,赋值给商品默认库存
+				if (productSelect === undefined && !this.attr.productAttr.length) {
+					productSelect = this.attr.productSelect;
+				}
+				//无属性值即库存为0；不存在加减；
+				if (productSelect === undefined) return;
+				let stock = productSelect.stock || 0;
+				let num = this.attr.productSelect;
+				if (changeValue) {
+					num.cart_num++;
+					if (num.cart_num > stock) {
+						this.$set(this.attr.productSelect, "cart_num", stock);
+						this.$set(this, "cart_num", stock);
+					} else {
+						this.$set(this.attr.productSelect, "cart_num", num.cart_num);
+						this.$set(this, "cart_num", num.cart_num);
+					}
+				} else {
+					num.cart_num--;
+					if (num.cart_num < 1) {
+						this.$set(this.attr.productSelect, "cart_num", 1);
+						this.$set(this, "cart_num", 1);
+					}
+				}
+			},
+			//将父级向子集多次传送的函数合二为一；
+			changeFun: function(opt) {
+				if (typeof opt !== "object") opt = {};
+				let action = opt.action || "";
+				let value = opt.value === undefined ? "" : opt.value;
+				this[action] && this[action](value);
+			},
+			//打开优惠券插件；
+			couponTap: function() {
+				let that = this;
+				that.coupons();
+				that.coupon.coupon = true;
+			},
+			changecoupon: function(msg) {
+				this.coupon.coupon = msg;
+				this.coupons();
+			},
+			currentcoupon: function(res) {
+				let that = this;
+				that.coupon.coupon = false;
+				that.$set(that.coupon.list[res], "is_use", true);
+			},
+			//可领取优惠券接口；
+			coupons: function() {
+				let that = this,
+					q = {
+						page: 1,
+						limit: 20
+					};
+				getCoupon(q).then(res => {
+					that.$set(that, "couponList", res.data || []);
+					that.$set(that.coupon, "list", res.data);
+				});
+			},
+			//打开属性插件；
+			selecAttrTap: function() {
+				this.attr.cartAttr = true;
+				this.isOpen = true;
+			},
+			changeattr: function(msg) {
+				this.attr.cartAttr = msg;
+				console.log(this.attr, msg);
+				this.isOpen = false;
+			},
+			//选择属性；
+			ChangeAttr: function(res) {
+				let productSelectValue = this.productValue[res];
+				if (productSelectValue) {
+					let productSelect = {
+						...this.attr.productSelect,
+						image: productSelectValue.image,
+						price: productSelectValue.price,
+						stock: productSelectValue.stock,
+						unique: productSelectValue.unique,
+						cart_num: 1
+					};
+					let attr = {
+						...this.attr,
+						productSelect
+					};
+					this.attr = attr;
+					// this.$set(this.attr.productSelect, "image", productSelect.image);
+					// this.$set(this.attr.productSelect, "price", productSelect.price);
+					// this.$set(this.attr.productSelect, "stock", productSelect.stock);
+					// this.$set(this.attr.productSelect, "unique", productSelect.unique);
+					// this.$set(this.attr.productSelect, "cart_num", 1);
+					this.$set(this, "attrValue", res);
+					this.$set(this, "attrTxt", "已选择");
+				} else {
+					this.$set(this.attr.productSelect, "image", this.storeInfo.image);
+					this.$set(this.attr.productSelect, "price", this.storeInfo.price);
+					this.$set(this.attr.productSelect, "stock", 0);
+					this.$set(this.attr.productSelect, "unique", "");
+					this.$set(this.attr.productSelect, "cart_num", 0);
+					this.$set(this, "attrValue", "");
+					this.$set(this, "attrTxt", "请选择");
+				}
+			},
+			//收藏商品
+			setCollect: function() {
+				let that = this,
+					id = that.storeInfo.id,
+					category = "product";
+				if (that.storeInfo.userCollect) {
+					getCollectDel(id, category).then(function() {
+						that.storeInfo.userCollect = !that.storeInfo.userCollect;
+					});
+				} else {
+					getCollectAdd(id, category).then(function() {
+						that.storeInfo.userCollect = !that.storeInfo.userCollect;
+					});
+				}
+			},
+			//  点击加入购物车按钮
+			joinCart: function() {
+				//0=加入购物车
+				this.goCat(0);
+			},
+			// 加入购物车；
+			goCat: function(news) {
+				let that = this,
+					productSelect = that.productValue[this.attrValue];
+				//打开属性
+				if (that.attrValue) {
+					//默认选中了属性，但是没有打开过属性弹窗还是自动打开让用户查看默认选中的属性
+					that.attr.cartAttr = !that.isOpen ? true : false;
+				} else {
+					if (that.isOpen) that.attr.cartAttr = true;
+					else that.attr.cartAttr = !that.attr.cartAttr;
+				}
+				//只有关闭属性弹窗时进行加入购物车
+				if (that.attr.cartAttr === true && that.isOpen === false)
+					return (that.isOpen = true);
+				//如果有属性,没有选择,提示用户选择
+				if (
+					that.attr.productAttr.length &&
+					productSelect === undefined &&
+					that.isOpen === true
+				) {
+					uni.showToast({
+						title: "产品库存不足，请选择其它",
+						icon: "none",
+						duration: 2000
+					});
+					return;
+				}
+				let q = {
+					productId: that.id,
+					cartNum: that.attr.productSelect.cart_num,
+					new: news,
+					uniqueId: that.attr.productSelect !== undefined ?
+						that.attr.productSelect.unique : ""
+				};
+				postCartAdd(q)
+					.then(function(res) {
+						that.isOpen = false;
+						that.attr.cartAttr = false;
+						if (news) {
+							that.$yrouter.push({
+								path: "/pages/order/OrderSubmission/index",
+								query: {
+									id: res.data.cartId
+								}
+							});
+						} else {
+							uni.showToast({
+								title: "添加购物车成功",
+								icon: "success",
+								duration: 2000,
+								complete: () => {
+									that.getCartCount(true);
+								}
+							});
+						}
+					})
+					.catch(error => {
+						that.isOpen = false;
+						uni.showToast({
+							title: error.response.data.msg,
+							icon: "none",
+							duration: 2000
+						});
+					});
+			},
+			//获取购物车数量
+			getCartCount: function(isAnima) {
+				let that = this;
+				const isLogin = that.isLogin;
+				if (isLogin) {
+					getCartCount({
+						numType: 0
+					}).then(res => {
+						that.CartCount = res.data.count;
+						//加入购物车后重置属性
+						if (isAnima) {
+							that.animated = true;
+							setTimeout(function() {
+								that.animated = false;
+							}, 500);
+						}
+					});
+				}
+			},
+			//立即购买；
+			tapBuy: function() {
+				//  1=直接购买
+				this.goCat(1);
+			},
+			listenerActionSheet: function() {
+				if (isWeixin() === true) {
+					this.weixinStatus = true;
+				}
+				this.posters = true;
+			},
+			listenerActionClose: function() {
+				this.posters = false;
+			}
+		}
+	};
 </script>
 
 
 <style scoped lang="less">
-.geoPage {
-  position: fixed;
-  width: 100%;
-  height: 100%;
-  top: 0;
-  z-index: 10000;
-}
+	.geoPage {
+		position: fixed;
+		width: 100%;
+		height: 100%;
+		top: 0;
+		z-index: 10000;
+	}
 
-.product-con .store-info {
-  margin-top: 0.2*100rpx;
-  background-color: #fff;
-}
+	.product-con .store-info {
+		margin-top: 0.2*100rpx;
+		background-color: #fff;
+	}
 
-.product-con .store-info .title {
-  padding: 0 0.3*100rpx;
-  font-size: 0.28*100rpx;
-  color: #282828;
-  height: 0.8*100rpx;
-  line-height: 0.8*100rpx;
-  border-bottom: 0.01*100rpx solid #f5f5f5;
-}
+	.product-con .store-info .title {
+		padding: 0 0.3*100rpx;
+		font-size: 0.28*100rpx;
+		color: #282828;
+		height: 0.8*100rpx;
+		line-height: 0.8*100rpx;
+		border-bottom: 0.01*100rpx solid #f5f5f5;
+	}
 
-.product-con .store-info .info {
-  padding: 0 0.3*100rpx;
-  height: 1.26*100rpx;
-}
+	.product-con .store-info .info {
+		padding: 0 0.3*100rpx;
+		height: 1.26*100rpx;
+	}
 
-.product-con .store-info .info .picTxt {
-  width: 6.15*100rpx;
-}
+	.product-con .store-info .info .picTxt {
+		width: 6.15*100rpx;
+	}
 
-.product-con .store-info .info .picTxt .pictrue {
-  width: 0.76*100rpx;
-  height: 0.76*100rpx;
-}
+	.product-con .store-info .info .picTxt .pictrue {
+		width: 0.76*100rpx;
+		height: 0.76*100rpx;
+	}
 
-.product-con .store-info .info .picTxt .pictrue image {
-  width: 100%;
-  height: 100%;
-  border-radius: 0.06*100rpx;
-}
+	.product-con .store-info .info .picTxt .pictrue image {
+		width: 100%;
+		height: 100%;
+		border-radius: 0.06*100rpx;
+	}
 
-.product-con .store-info .info .picTxt .text {
-  width: 5.22*100rpx;
-}
+	.product-con .store-info .info .picTxt .text {
+		width: 5.22*100rpx;
+	}
 
-.product-con .store-info .info .picTxt .text .name {
-  font-size: 0.3*100rpx;
-  color: #282828;
-}
+	.product-con .store-info .info .picTxt .text .name {
+		font-size: 0.3*100rpx;
+		color: #282828;
+	}
 
-.product-con .store-info .info .picTxt .text .address {
-  font-size: 0.24*100rpx;
-  color: #666;
-  margin-top: 0.03*100rpx;
-}
+	.product-con .store-info .info .picTxt .text .address {
+		font-size: 0.24*100rpx;
+		color: #666;
+		margin-top: 0.03*100rpx;
+	}
 
-.product-con .store-info .info .picTxt .text .address .iconfont {
-  color: #707070;
-  font-size: 0.18*100rpx;
-  margin-left: 0.1*100rpx;
-}
+	.product-con .store-info .info .picTxt .text .address .iconfont {
+		color: #707070;
+		font-size: 0.18*100rpx;
+		margin-left: 0.1*100rpx;
+	}
 
-.product-con .store-info .info .picTxt .text .address .addressTxt {
-  width: 4.8*100rpx;
-}
+	.product-con .store-info .info .picTxt .text .address .addressTxt {
+		width: 4.8*100rpx;
+	}
 
-.product-con .store-info .info .iconfont {
-  font-size: 0.4*100rpx;
-}
+	.product-con .store-info .info .iconfont {
+		font-size: 0.4*100rpx;
+	}
 
-.product-con .superior {
-  background-color: #fff;
-  margin-top: 0.2*100rpx;
-}
+	.product-con .superior {
+		background-color: #fff;
+		margin-top: 0.2*100rpx;
+	}
 
-.product-con .superior .title {
-  height: 0.98*100rpx;
-}
+	.product-con .superior .title {
+		height: 0.98*100rpx;
+	}
 
-.product-con .superior .title image {
-  width: 0.3*100rpx;
-  height: 0.3*100rpx;
-}
+	.product-con .superior .title image {
+		width: 0.3*100rpx;
+		height: 0.3*100rpx;
+	}
 
-.product-con .superior .title .titleTxt {
-  margin: 0 0.2*100rpx;
-  font-size: 0.3*100rpx;
-  background-image: linear-gradient(to right, #f57a37 0%, #f21b07 100%);
-  background-image: -webkit-linear-gradient(to right, #f57a37 0%, #f21b07 100%);
-  background-image: -moz-linear-gradient(to right, #f57a37 0%, #f21b07 100%);
-  -webkit-background-clip: text;
-  -webkit-text-fill-color: transparent;
-}
+	.product-con .superior .title .titleTxt {
+		margin: 0 0.2*100rpx;
+		font-size: 0.3*100rpx;
+		background-image: linear-gradient(to right, #f57a37 0%, #f21b07 100%);
+		background-image: -webkit-linear-gradient(to right, #f57a37 0%, #f21b07 100%);
+		background-image: -moz-linear-gradient(to right, #f57a37 0%, #f21b07 100%);
+		-webkit-background-clip: text;
+		-webkit-text-fill-color: transparent;
+	}
 
-.product-con .superior .slider-banner {
-  width: 6.9*100rpx;
-  margin: 0 auto;
-  padding-bottom: 0.2*100rpx;
-}
+	.product-con .superior .slider-banner {
+		width: 6.9*100rpx;
+		margin: 0 auto;
+		padding-bottom: 0.2*100rpx;
+	}
 
-.product-con .superior .slider-banner .list {
-  width: 100%;
-  padding-bottom: 0.2*100rpx;
-}
+	.product-con .superior .slider-banner .list {
+		width: 100%;
+		padding-bottom: 0.2*100rpx;
+	}
 
-.product-con .superior .slider-banner .list .item {
-  width: 2.15*100rpx;
-  margin: 0 0.22*100rpx 0.3*100rpx 0;
-  font-size: 0.26*100rpx;
-}
+	.product-con .superior .slider-banner .list .item {
+		width: 2.15*100rpx;
+		margin: 0 0.22*100rpx 0.3*100rpx 0;
+		font-size: 0.26*100rpx;
+	}
 
-.product-con .superior .slider-banner .list .item:nth-of-type(3n) {
-  margin-right: 0;
-}
+	.product-con .superior .slider-banner .list .item:nth-of-type(3n) {
+		margin-right: 0;
+	}
 
-.product-con .superior .slider-banner .list .item .pictrue {
-  width: 100%;
-  height: 2.15*100rpx;
-}
+	.product-con .superior .slider-banner .list .item .pictrue {
+		width: 100%;
+		height: 2.15*100rpx;
+	}
 
-.product-con .superior .slider-banner .list .item .pictrue image {
-  width: 100%;
-  height: 100%;
-  border-radius: 0.06*100rpx;
-}
+	.product-con .superior .slider-banner .list .item .pictrue image {
+		width: 100%;
+		height: 100%;
+		border-radius: 0.06*100rpx;
+	}
 
-.product-con .superior .slider-banner .list .item .name {
-  color: #282828;
-  margin-top: 0.12*100rpx;
-}
+	.product-con .superior .slider-banner .list .item .name {
+		color: #282828;
+		margin-top: 0.12*100rpx;
+	}
 
-.product-con .superior .slider-banner .swiper-pagination-bullet {
-  background-color: #999;
-}
+	.product-con .superior .slider-banner .swiper-pagination-bullet {
+		background-color: #999;
+	}
 
-.product-con .superior .slider-banner .swiper-pagination-bullet-active {
-  background-color: #e93323;
-}
+	.product-con .superior .slider-banner .swiper-pagination-bullet-active {
+		background-color: #e93323;
+	}
 
-.mask {
-  -webkit-filter: blur(2px);
-  -moz-filter: blur(2px);
-  -ms-filter: blur(2px);
-  filter: blur(2px);
-}
+	.mask {
+		-webkit-filter: blur(2px);
+		-moz-filter: blur(2px);
+		-ms-filter: blur(2px);
+		filter: blur(2px);
+	}
 
-.footer .icon-shoucang1 {
-  color: #73cbb6;
-}
+	.footer .icon-shoucang1 {
+		color: #73cbb6;
+	}
 
-.product-con .product-intro .conter view {
-  width: 100% !important;
-}
+	.product-con .product-intro .conter view {
+		width: 100% !important;
+	}
 
-.generate-posters {
-  width: 100%;
-  height: 1.7*100rpx;
-  background-color: #fff;
-  position: fixed;
-  left: 0;
-  bottom: 0;
-  z-index: 99;
-  transform: translate3d(0, 100%, 0);
-  -webkit-transform: translate3d(0, 100%, 0);
-  -ms-transform: translate3d(0, 100%, 0);
-  -moz-transform: translate3d(0, 100%, 0);
-  -o-transform: translate3d(0, 100%, 0);
-  transition: all 0.3s cubic-bezier(0.25, 0.5, 0.5, 0.9);
-  -webkit-transition: all 0.3s cubic-bezier(0.25, 0.5, 0.5, 0.9);
-  -moz-transition: all 0.3s cubic-bezier(0.25, 0.5, 0.5, 0.9);
-  -o-transition: all 0.3s cubic-bezier(0.25, 0.5, 0.5, 0.9);
-}
+	.generate-posters {
+		width: 100%;
+		height: 1.7*100rpx;
+		background-color: #fff;
+		position: fixed;
+		left: 0;
+		bottom: 0;
+		z-index: 99;
+		transform: translate3d(0, 100%, 0);
+		-webkit-transform: translate3d(0, 100%, 0);
+		-ms-transform: translate3d(0, 100%, 0);
+		-moz-transform: translate3d(0, 100%, 0);
+		-o-transform: translate3d(0, 100%, 0);
+		transition: all 0.3s cubic-bezier(0.25, 0.5, 0.5, 0.9);
+		-webkit-transition: all 0.3s cubic-bezier(0.25, 0.5, 0.5, 0.9);
+		-moz-transition: all 0.3s cubic-bezier(0.25, 0.5, 0.5, 0.9);
+		-o-transition: all 0.3s cubic-bezier(0.25, 0.5, 0.5, 0.9);
+	}
 
-.generate-posters.on {
-  transform: translate3d(0, 0, 0);
-  -webkit-transform: translate3d(0, 0, 0);
-  -ms-transform: translate3d(0, 0, 0);
-  -moz-transform: translate3d(0, 0, 0);
-  -o-transform: translate3d(0, 0, 0);
-}
+	.generate-posters.on {
+		transform: translate3d(0, 0, 0);
+		-webkit-transform: translate3d(0, 0, 0);
+		-ms-transform: translate3d(0, 0, 0);
+		-moz-transform: translate3d(0, 0, 0);
+		-o-transform: translate3d(0, 0, 0);
+	}
 
-.generate-posters .item {
-  flex: 50%;
-  -webkit-flex: 50%;
-  -ms-flex: 50%;
-  text-align: center;
-}
+	.generate-posters .item {
+		flex: 50%;
+		-webkit-flex: 50%;
+		-ms-flex: 50%;
+		text-align: center;
+	}
 
-.generate-posters .item .iconfont {
-  font-size: 0.8*100rpx;
-  color: #5eae72;
-}
+	.generate-posters .item .iconfont {
+		font-size: 0.8*100rpx;
+		color: #5eae72;
+	}
 
-.generate-posters .item .iconfont.icon-haibao {
-  color: #5391f1;
-}
+	.generate-posters .item .iconfont.icon-haibao {
+		color: #5391f1;
+	}
 
-.noscroll {
-  height: 100%;
-  overflow: hidden;
-}
-</style>
+	.noscroll {
+		height: 100%;
+		overflow: hidden;
+	}
+</style>
diff --git a/pages/shop/GoodsList/index.vue b/pages/shop/GoodsList/index.vue
index 0e1cf56..2e5bd44 100644
--- a/pages/shop/GoodsList/index.vue
+++ b/pages/shop/GoodsList/index.vue
@@ -79,7 +79,6 @@
 <script>
 import Recommend from "@/components/Recommend";
 import { getProducts } from "@/api/store";
-import debounce from "lodash.debounce";
 import Loading from "@/components/Loading";
 
 export default {
diff --git a/pages/shop/ShoppingCart/index.vue b/pages/shop/ShoppingCart/index.vue
index 880447b..5114bda 100644
--- a/pages/shop/ShoppingCart/index.vue
+++ b/pages/shop/ShoppingCart/index.vue
@@ -177,7 +177,6 @@ import {
 import { postCollectAll } from "@/api/user";
 import { mul, add } from "@/utils/bc";
 import cookie from "@/utils/store/cookie";
-import debounce from "lodash.debounce";
 
 const CHECKED_IDS = "cart_checked";
 
diff --git a/pages/user/Login/index.vue b/pages/user/Login/index.vue
index 0ae6337..dad9947 100644
--- a/pages/user/Login/index.vue
+++ b/pages/user/Login/index.vue
@@ -84,6 +84,14 @@
 						<input type="password" placeholder="填写您的登录密码" v-model="password" />
 					</view>
 				</view>
+				<view class="item">
+					<view>
+						<!-- <svg class="icon" aria-hidden="true">
+				  <use xlink:href="#icon-phone_" />
+				</svg> -->
+						<input type="text" placeholder="输入邀请码" v-model="inviteCode" />
+					</view>
+				</view>
 			</view>
 			<view class="logon" @click="register">注册</view>
 			<view class="tip">
@@ -112,8 +120,10 @@
 	} from "@/utils/dialog";
 	import dayjs from "dayjs";
 	import cookie from "@/utils/store/cookie";
-
-import {handleGetUserInfo} from '@/utils'
+
+	import {
+		handleGetUserInfo
+	} from '@/utils'
 
 	const BACK_URL = "login_back_url";
 
@@ -126,7 +136,8 @@ import {handleGetUserInfo} from '@/utils'
 				current: 0,
 				account: "",
 				password: "",
-				captcha: "",
+				captcha: "",
+				inviteCode:"",
 				formItem: 1,
 				type: "login"
 			};
@@ -211,6 +222,7 @@ import {handleGetUserInfo} from '@/utils'
 						account: that.account,
 						captcha: that.captcha,
 						password: that.password,
+						inviteCode: that.inviteCode,
 						spread: cookie.get("spread")
 					})
 					.then(res => {
@@ -306,11 +318,11 @@ import {handleGetUserInfo} from '@/utils'
 					.then(({
 						data
 					}) => {
-						this.$store.commit("LOGIN", data.token, dayjs(data.expires_time));
-						handleGetUserInfo()
-						// let replace=this.$yroute.query.replace
-						// if(replace){
-							
+						this.$store.commit("LOGIN", data.token, dayjs(data.expires_time));
+						handleGetUserInfo()
+						// let replace=this.$yroute.query.replace
+						// if(replace){
+
 						// }
 						// this.$yrouter.replace({
 						// 	path: this.$yroute.query.replace || '/pages/home/index'
diff --git a/pages/user/User/index.vue b/pages/user/User/index.vue
index 5ea669e..61e9a83 100644
--- a/pages/user/User/index.vue
+++ b/pages/user/User/index.vue
@@ -118,6 +118,14 @@
 			</view>
 			<view class="by">
 				<text class="by-text">By@意象</text>
+			</view>
+			<view class="by">
+				<view>
+				<text class="by-text">Copyright © 2020</text>
+				</view>
+				<view>
+				<text class="by-text">漯河市大有前途网络科技有限公司</text>
+				</view>
 			</view>
 			<view class="footer-line-height"></view>
 			<!-- <SwitchWindow
@@ -295,7 +303,8 @@
 				this.MenuUser();
 			}
 		},
-		onShow() {
+		onShow() {
+			console.log(this.$store.getters.token)
 			console.log(this.userInfo);
 			if (this.$store.getters.token) {
 				this.User();
diff --git a/pages/user/coupon/GetCoupon/index.vue b/pages/user/coupon/GetCoupon/index.vue
index ecb1fde..9e1b42a 100644
--- a/pages/user/coupon/GetCoupon/index.vue
+++ b/pages/user/coupon/GetCoupon/index.vue
@@ -14,8 +14,8 @@
           <view class="condition line1">购物满{{ item.useMinPrice }}元可用</view>
           <view class="data acea-row row-between-wrapper">
             <view v-if="item.endTime !== 0">
-              <data-format-t :data="item.startTime"></data-format-t>-
-              <data-format-t :data="item.endTime"></data-format-t>
+              <data-format-t :date="item.startTime"></data-format-t>-
+              <data-format-t :date="item.endTime"></data-format-t>
             </view>
             <view v-else>不限时</view>
             <view class="bnt gray" v-if="item.isUse === true">已领取</view>
diff --git a/pages/user/coupon/UserCoupon/index.vue b/pages/user/coupon/UserCoupon/index.vue
index 2a9ba2a..d6fb017 100644
--- a/pages/user/coupon/UserCoupon/index.vue
+++ b/pages/user/coupon/UserCoupon/index.vue
@@ -13,7 +13,7 @@
           <view class="condition line1">{{ item.couponTitle }}</view>
           <view class="data acea-row row-between-wrapper">
             <view v-if="item.endTime === 0">不限时</view>
-            <view v-else><data-format-t :data="item.addTime"></data-format-t> - <data-format-t :data="item.endTime"></data-format-t></view>
+            <view v-else><data-format-t :date="item.addTime"></data-format-t> - <data-format-t :date="item.endTime"></data-format-t></view>
             <view class="bnt gray" v-if="item._type === 0">{{ item._msg }}</view>
             <view class="bnt bg-color-red" v-else>{{ item._msg }}</view>
           </view>
diff --git a/pages/user/promotion/Poster/index.vue b/pages/user/promotion/Poster/index.vue
index 2f4a147..9180f74 100644
--- a/pages/user/promotion/Poster/index.vue
+++ b/pages/user/promotion/Poster/index.vue
@@ -1,145 +1,153 @@
 <template>
-  <view class="distribution-posters">
-    <view class="slider-banner banner">
-      <swiper indicatorDots="true">
-        <block v-for="(item, infoIndex) in info" :key="infoIndex">
-          <swiper-item>
-            <image class="slide-image" :src="item.wap_poster" mode="widthFix" show-menu-by-longpress />
-          </swiper-item>
-        </block>
-      </swiper>
-    </view>
-    <view class="keep bg-color-red" @click="saveImg">保存海报</view>
-  </view>
+	<view class="distribution-posters">
+		<view class="slider-banner banner">
+			<swiper indicatorDots="true">
+				<block v-for="(item, infoIndex) in info" :key="infoIndex">
+					<swiper-item>
+						<image class="slide-image" :src="item.wap_poster" mode="widthFix" show-menu-by-longpress />
+					</swiper-item>
+				</block>
+			</swiper>
+		</view>
+		<view class="keep bg-color-red" @click="saveImg">保存海报</view>
+	</view>
 </template>
 <script>
-// import { swiper, swiperSlide } from "vue-awesome-swiper";
-import { getSpreadImg } from "@/api/user";
+	// import { swiper, swiperSlide } from "vue-awesome-swiper";
+	import {
+		getSpreadImg
+	} from "@/api/user";
 
-export default {
-  name: "Poster",
-  components: {
-    // swiper,
-    // swiperSlide
-  },
-  props: {},
-  data: function() {
-    return {
-      swiperPosters: {
-        speed: 1000,
-        effect: "coverflow",
-        slidesPerView: "auto",
-        centeredSlides: true,
-        coverflowEffect: {
-          rotate: 0, // 旋转的角度
-          stretch: -20, // 拉伸   图片间左右的间距和密集度
-          depth: 100, // 深度   切换图片间上下的间距和密集度
-          modifier: 3, // 修正值 该值越大前面的效果越明显
-          slideShadows: false // 页面阴影效果
-        },
-        observer: true,
-        observeParents: true
-      },
-      info: [],
-      activeIndex: 0
-    };
-  },
-  mounted: function() {
-    this.getIndex();
-    let that = this;
-    // this.swiper.on("slideChange", function() {
-    //   that.activeIndex = that.swiper.activeIndex;
-    // });
-  },
-  computed: {
-    swiper() {
-      // return this.$refs.mySwiper.swiper;
-    }
-  },
-  methods: {
-    getIndex: function() {
-      let that = this;
-      getSpreadImg().then(
-        res => {
-          that.info = res.data;
-        },
-        err => {
-          uni.showToast({
-				title: err.msg || err.response.data.msg,
-				icon: 'none',
-				duration: 2000
-			});
-        }
-      );
-    },
-    downloadIamge: function(imgsrc, name) {
-      var that = this;
-      this.isDown = true;
-      var downloadUrl = imgsrc;
+	export default {
+		name: "Poster",
+		components: {
+			// swiper,
+			// swiperSlide
+		},
+		props: {},
+		data: function() {
+			return {
+				swiperPosters: {
+					speed: 1000,
+					effect: "coverflow",
+					slidesPerView: "auto",
+					centeredSlides: true,
+					coverflowEffect: {
+						rotate: 0, // 旋转的角度
+						stretch: -20, // 拉伸   图片间左右的间距和密集度
+						depth: 100, // 深度   切换图片间上下的间距和密集度
+						modifier: 3, // 修正值 该值越大前面的效果越明显
+						slideShadows: false // 页面阴影效果
+					},
+					observer: true,
+					observeParents: true
+				},
+				info: [],
+				activeIndex: 0
+			};
+		},
+		mounted: function() {
+			this.getIndex();
+			let that = this;
+			// this.swiper.on("slideChange", function() {
+			//   that.activeIndex = that.swiper.activeIndex;
+			// });
+		},
+		computed: {
+			swiper() {
+				// return this.$refs.mySwiper.swiper;
+			}
+		},
+		methods: {
+			getIndex: function() {
+				let that = this;
+				let form = {}
+				if (this.$deviceType == 'app') {
+					form.form = 'app'
+				}
+				getSpreadImg(form).then(
+					res => {
+						that.info = res.data;
+					},
+					err => {
+						uni.showToast({
+							title: err.msg || err.response.data.msg,
+							icon: 'none',
+							duration: 2000
+						});
+					}
+				);
+			},
+			downloadIamge: function(imgsrc, name) {
+				var that = this;
+				this.isDown = true;
+				var downloadUrl = imgsrc;
 
-      if (!wx.saveImageToPhotosAlbum) {
-        uni.showModal({
-          title: "提示",
-          content:
-            "当前微信版本过低，无法使用该功能，请升级到最新微信版本后重试。"
-        });
-        that.openDialogVisible = true;
+				if (!wx.saveImageToPhotosAlbum) {
+					uni.showModal({
+						title: "提示",
+						content: "当前微信版本过低，无法使用该功能，请升级到最新微信版本后重试。"
+					});
+					that.openDialogVisible = true;
 
-        return;
-      }
+					return;
+				}
 
-      // 可以通过 wx.getSetting 先查询一下用户是否授权了 "scope.writePhotosAlbum" 这个 scope
-      wx.getSetting({
-        success(res) {
-          if (!res.authSetting["scope.writePhotosAlbum"]) {
-            that.openDialogVisible = true;
+				// 可以通过 wx.getSetting 先查询一下用户是否授权了 "scope.writePhotosAlbum" 这个 scope
+				wx.getSetting({
+					success(res) {
+						if (!res.authSetting["scope.writePhotosAlbum"]) {
+							that.openDialogVisible = true;
 
-            // 接口调用询问
-            wx.authorize({
-              scope: "scope.writePhotosAlbum",
-              success() {
-                that.downloadImage(downloadUrl);
-              },
-              fail() {
-                // 用户拒绝了授权
-                // 打开设置页面
-                wx.openSetting({
-                  success: function(data) {},
-                  fail: function(data) {}
-                });
-              }
-            });
-          } else {
-            that.downloadImage(downloadUrl);
-          }
-        },
-        fail(res) {
-          that.openDialogVisible = true;
-        }
-      });
-    },
-    saveImg: function() {
-      this.downloadIamge(
-        this.info[this.activeIndex].wap_poster,
-        "poster" + this.activeIndex
-      );
-    }
-  }
-};
+							// 接口调用询问
+							wx.authorize({
+								scope: "scope.writePhotosAlbum",
+								success() {
+									that.downloadImage(downloadUrl);
+								},
+								fail() {
+									// 用户拒绝了授权
+									// 打开设置页面
+									wx.openSetting({
+										success: function(data) {},
+										fail: function(data) {}
+									});
+								}
+							});
+						} else {
+							that.downloadImage(downloadUrl);
+						}
+					},
+					fail(res) {
+						that.openDialogVisible = true;
+					}
+				});
+			},
+			saveImg: function() {
+				this.downloadIamge(
+					this.info[this.activeIndex].wap_poster,
+					"poster" + this.activeIndex
+				);
+			}
+		}
+	};
 </script>
 
 <style scoped lang="less">
-.distribution-posters {
-  height: 100%;
-}
-.banenr {
-  height: 100%;
-}
-.banner swiper {
-  height: 100%;
-}
-.banner .slide-image {
-  width: 100%;
-  height: auto;
-}
-</style>
+	.distribution-posters {
+		height: 100%;
+	}
+
+	.banenr {
+		height: 100%;
+	}
+
+	.banner swiper {
+		height: 100%;
+	}
+
+	.banner .slide-image {
+		width: 100%;
+		height: auto;
+	}
+</style>
diff --git a/pages/user/signIn/Integral/index.vue b/pages/user/signIn/Integral/index.vue
index 4988c8a..aeb7a49 100644
--- a/pages/user/signIn/Integral/index.vue
+++ b/pages/user/signIn/Integral/index.vue
@@ -45,7 +45,7 @@
           <view>
             <view class="state">{{ item.title }}</view>
             <view>
-              <data-format :data="item.addTime"></data-format>
+              <data-format :date="item.addTime"></data-format>
             </view>
           </view>
           <view class="num" v-if="item.pm == 1">+{{ item.number }}</view>
diff --git a/utils/index.js b/utils/index.js
index de944f8..f919897 100644
--- a/utils/index.js
+++ b/utils/index.js
@@ -35,7 +35,7 @@ export function dataFormat(time, option) {
 	}
 }
 
-export function dataFormatT(time) {
+export function dateFormatT(time) {
 	time = +time * 1000;
 	const d = new Date(time);
 
@@ -121,7 +121,7 @@ export const replaceLogin = (msg) => {
 	// 这里代表已经失去登录状态以及401强制推出登录了
 	store.commit('LOGOUT')
 	console.log(uni, 989)
-	if (Vue.prototype.$deviceType == 'Weixin') {
+	if (Vue.prototype.$deviceType == 'weixin') {
 		// 如果是微信小程序，跳转到授权页
 		replace({
 			path: '/pages/authorization/index',
@@ -199,7 +199,7 @@ export const login = (option) => {
 								console.log(user)
 								console.log(`用户昵称为 | ${user.userInfo.nickName}`);
 								console.log(`当前的环境 | ${Vue.prototype.$deviceType}`)
-								if (Vue.prototype.$deviceType == 'Weixin') {
+								if (Vue.prototype.$deviceType == 'weixin') {
 									wxappAuth({
 										encryptedData: user.encryptedData,
 										iv: user.iv,
diff --git a/utils/request.js b/utils/request.js
index 22c2d82..6bb0b15 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -43,7 +43,9 @@ function baseRequest(options) {
   const { url, params, data, login, ...option } = options
   return fly.request(url, params || data, {
     ...option
-  }).then(res => {
+  }).then(res => {
+	  console.log(res)
+	  console.log(url,params,data, ...option)
     const data = res.data || {};
     if (res.status !== 200)
       return Promise.reject({ msg: "请求失败", res, data });