优化微信网页登录

# Conflicts:
#	pages/product/goods.vue

.hbuilderx/launch.json

@@ -2,10 +2,23 @@
   // launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数
     "version": "0.0",
     "configurations": [{
-            "type": "uniCloud",
-            "default": {
+     	"app-plus" : 
+     	{
      		"launchtype" : "remote"
-            }
+     	},
+     	"default" : 
+     	{
+     		"launchtype" : "remote"
+     	},
+     	"h5" : 
+     	{
+     		"launchtype" : "remote"
+     	},
+     	"mp-weixin" : 
+     	{
+     		"launchtype" : "remote"
+     	},
+     	"type" : "uniCloud"
      }
     ]
 }

App.vue

@@ -1,4 +1,5 @@
 
+
 <script>
 /**
  * vuex管理登录状态，具体可以参考官方登录模板示例
@@ -15,6 +16,35 @@ export default {
       config,
     };
   },
+
+  /**
+   * 监听返回
+   */
+  onBackPress(e) {
+    if (e.from == "backbutton") {
+      let routes = getCurrentPages();
+      let curRoute = routes[routes.length - 1].options;
+      routes.forEach((item) => {
+        if (
+          item.route == "pages/tabbar/cart/cartList" ||
+          item.route.indexOf("pages/product/goods") != -1
+        ) {
+          uni.redirectTo({
+            url: item.route,
+          });
+        }
+      });
+
+      if (curRoute.addId) {
+        uni.reLaunch({
+          url: "/pages/tabbar/cart/cartList",
+        });
+      } else {
+        uni.navigateBack();
+      }
+      return true; //阻止默认返回行为
+    }
+  },
   methods: {
     ...mapMutations(["login"]),
   },
@@ -22,11 +52,16 @@ export default {
     // #ifdef APP-PLUS
     this.checkArguments(); // 检测启动参数
     APPUpdate();
+
     // 重点是以下： 一定要监听后台恢复 ！一定要
     plus.globalEvent.addEventListener("newintent", (e) => {
       this.checkArguments(); // 检测启动参数
     });
     // #endif
+
+    // #ifdef MP-WEIXIN
+    this.applyUpdateWeChat();
+    // #endif
   },
 
   onShow() {
@@ -34,8 +69,34 @@ export default {
     this.getClipboard();
     // #endif
   },
-
   methods: {
+    /**
+     * 微信小程序版本提交更新版本 解决缓存问题
+     */
+    applyUpdateWeChat() {
+      const updateManager = uni.getUpdateManager();
+
+      updateManager.onCheckForUpdate(function (res) {
+        // 请求完新版本信息的回调
+      });
+
+      updateManager.onUpdateReady(function (res) {
+        uni.showModal({
+          title: "更新提示",
+          content: "发现新版本，是否重启应用？",
+          success(res) {
+            if (res.confirm) {
+              // 新的版本已经下载好，调用 applyUpdate 应用新版本并重启
+              updateManager.applyUpdate();
+            }
+          },
+        });
+      });
+      updateManager.onUpdateFailed(function (res) {
+        // 新的版本下载失败
+      });
+    },
+
     //  TODO 开屏广告 后续优化添加
     launch() {
       try {
@@ -134,7 +195,7 @@ export default {
 
 <style lang="scss">
 @import "uview-ui/index.scss";
-@import "./static/font/iconfont/iconfont.css";
+
 // -------适配底部安全区  苹果x系列刘海屏
 
 // #ifdef MP-WEIXIN

api/address.js

@@ -19,6 +19,7 @@ export function getAddressList(pageNumber, pageSize) {
   });
 }
 
+
 /**
  * 获取物流公司
  */

api/common.js

@@ -1,25 +1,9 @@
 /**
  * 公共API
  */
-import storage from "@/utils/storage.js"
 import {http, Method} from '@/utils/request.js';
 import api from '@/config/api.js';
 
-/**
- * 获取图片验证码URL
- * @param type
- * @param uuid
- * @returns {string}
- */
-export function getValidateCodeUrl(type, uuid) {
-  if (!type) {
-    return '';
-  }
-  if (!uuid) {
-    uuid = storage.getUuid()
-  }
-  return `${api.base}/captchas/${uuid}/${type}?r=${new Date().getTime()}`;
-}
 
 
 /**

api/goods.js

@@ -118,17 +118,6 @@ export function getCategoryList(id) {
   });
 }
 
-/**
- * 获取商品分类
- * @param parent_id
- */
-export function getCategory(parent_id = 0) {
-  return http.request({
-    url: `goods/categories/${parent_id}/children`,
-    method: Method.GET,
-    loading: false,
-  });
-}
 
 
 
@@ -167,20 +156,23 @@ export function cash(params) {
 /**
  * 分销商提现历史
  */
-export function cashLog() {
+export function cashLog(params) {
   return http.request({
     url: `/distribution/cash`,
     method: Method.GET,
+    params
+
   });
 }
 
 /**
  * 获取分销商分页订单列表
  */
-export function distributionOrderList() {
+export function distributionOrderList(params) {
   return http.request({
     url: `/distribution/distributionOrder`,
     method: Method.GET,
+    params
   });
 }
 
@@ -197,10 +189,11 @@ export function distributionGoods(params) {
 /**
  * 选择分销商品 分销商品id
  */
-export function checkedDistributionGoods(id) {
+export function checkedDistributionGoods(params) {
   return http.request({
-    url: `/distributionGoods/checked/${id}`,
+    url: `/distributionGoods/checked/${params.id}`,
     method: Method.GET,
+    params
   });
 }
 

api/home.js

@@ -30,12 +30,12 @@ export function getCategory(parent_id = 0) {
  * 获取热门关键词
  * @param num
  */
-export function getHotKeywords(start = 0, end = 10) {
+export function getHotKeywords(count) {
   return http.request({
     url: "/goods/hot-words",
     method: Method.GET,
     loading: false,
-    params: { start, end },
+    params: { count },
   });
 }
 

api/login.js

@@ -1,11 +1,6 @@
-import {
-	http
-} from "@/utils/request.js";
-
-
-import api from '@/config/api.js'
-
+import { http } from "@/utils/request.js";
 
+import api from "@/config/api.js";
 
 /**
  * 通过短信重置密码
@@ -15,18 +10,17 @@ export function resetByMobile(params) {
   return http.request({
     url: `/members/resetByMobile`,
     method: "POST",
-		params
+    params,
   });
 }
 
-
 /**
  * 发送验证码
  * @param  mobile
  */
-export function sendMobile(mobile) {
+export function sendMobile(mobile,type='LOGIN') {
   return http.request({
-		url: `${api.common}/sms/LOGIN/${mobile}`,
+    url: `${api.common}/sms/${type}/${mobile}`,
     method: "GET",
   });
 }
@@ -43,13 +37,11 @@ export function smsLogin(params, clientType) {
     data: params,
     header: {
       "content-type": "application/x-www-form-urlencoded",
-			"clientType": clientType
-		}
+      clientType: clientType,
+    },
   });
 }
 
-
-
 /**
  * 修改密码
  * @param  newPassword
@@ -68,7 +60,6 @@ export function smsLogin(params, clientType) {
  * 刷新token
  */
 export function refreshTokenFn(refresh_token) {
-
   return http.request({
     url: `/members/refresh/${refresh_token}`,
     method: "GET",

api/members.js

@@ -1,22 +1,49 @@
-import storage from "@/utils/storage"
-import {http, Method} from '@/utils/request.js';
-
-
+import storage from "@/utils/storage";
+import { http, Method } from "@/utils/request.js";
 
 /**
  * 意见反馈
  */
 export function feedBack(params) {
   return http.request({
-    url: '/feedback',
+    url: "/feedback",
     method: Method.POST,
     needToken: true,
     params,
   });
 }
 
+// 提现
+export function withdrawalApply(params) {
+  return http.request({
+    url: "/members/wallet/withdrawal",
+    method: Method.POST,
+    needToken: true,
+    params,
+  });
+}
 
+/**
+ * 支付结果查询
+ * @param orderType 交易类型,可用值:TRADE,ORDER,RECHARGE
+ * @param sn   订单编号
+ */
+export function payCallback(params) {
+  return http.request({
+    url: `/cashier/result`,
+    method: Method.GET,
+    params,
+  });
+}
 
+// 在线充值
+export function recharge(params) {
+  return http.request({
+    url: "/trade/recharge",
+    method: Method.POST,
+    params,
+  });
+}
 
 /**
  * 分页获取预存款充值记录
@@ -44,16 +71,13 @@ import {http, Method} from '@/utils/request.js';
   });
 }
 
-
-
-
 /**
  * 获取优惠券列表
  * @param params
  */
 export function getCoupons(params) {
   return http.request({
-    url: '/promotion/coupon/getCoupons',
+    url: "/promotion/coupon/getCoupons",
     method: Method.GET,
     needToken: true,
     params,
@@ -79,14 +103,13 @@ export function receiveCoupons(couponId) {
  */
 export function getPointsData(params) {
   return http.request({
-    url: 'member/memberPointsHistory/getByPage',
+    url: "member/memberPointsHistory/getByPage",
     method: Method.GET,
     needToken: true,
     params,
   });
 }
 
-
 /**
  * 获取我的评论列表
  * @param params
@@ -94,7 +117,7 @@ export function getPointsData(params) {
  */
 export function getComments(params) {
   return http.request({
-    url: '/memberEvaluation',
+    url: "/memberEvaluation",
     method: Method.GET,
     needToken: true,
     params,
@@ -108,26 +131,23 @@ export function getComments(params) {
  */
 export function getFootprintNum(params) {
   return http.request({
-    url: '/footprint/getFootprintNum',
+    url: "/footprint/getFootprintNum",
     method: Method.GET,
     needToken: true,
     params,
   });
 }
 
-
-
-
 /**
  * 订单评论
  * @param params
  */
 export function commentsMemberOrder(params) {
   return http.request({
-    url: '/memberEvaluation',
+    url: "/memberEvaluation",
     method: Method.POST,
     needToken: true,
-	  header:{'content-type':"application/x-www-form-urlencoded"},
+    header: { "content-type": "application/x-www-form-urlencoded" },
     data: params,
   });
 }
@@ -138,10 +158,10 @@ export function commentsMemberOrder(params) {
  */
 export function AppendCommentsOrder(params) {
   return http.request({
-    url: 'members/comments/additional',
+    url: "members/comments/additional",
     method: Method.POST,
     needToken: true,
-	  header:{'content-type':"application/x-www-form-urlencoded"},
+    header: { "content-type": "application/x-www-form-urlencoded" },
     data: params,
   });
 }
@@ -154,14 +174,14 @@ export function AppendCommentsOrder(params) {
  */
 export function consultating(goods_id, ask_content, anonymous) {
   return http.request({
-    url: 'members/asks',
+    url: "members/asks",
     method: Method.POST,
-	  header:{'content-type':"application/x-www-form-urlencoded"},
+    header: { "content-type": "application/x-www-form-urlencoded" },
     needToken: true,
     data: {
       goods_id,
       ask_content,
-      anonymous
+      anonymous,
     },
   });
 }
@@ -182,23 +202,18 @@ export function getGoodsCollection(params,type) {
   });
 }
 
-
-
 /**
  * 收藏商品
  * @returns {AxiosPromise}
  */
-export function collectionGoods(id,type) {
+export function collectionGoods(type, id) {
   return http.request({
     url: `/member/collection/add/${type}/${id}`,
     method: Method.POST,
     needToken: true,
- 
   });
 }
 
-
-
 /**
  * 删除商品收藏
  * @param ids 收藏ID【集合或单个商品ID】
@@ -206,7 +221,7 @@ export function collectionGoods(id,type) {
  */
 export function deleteGoodsCollection(ids) {
   if (Array.isArray(ids)) {
-    ids = ids.join(',');
+    ids = ids.join(",");
   }
   return http.request({
     url: `/member/collection/delete/GOODS/${ids}`,
@@ -215,11 +230,23 @@ export function deleteGoodsCollection(ids) {
   });
 }
 
+/**
+ * 删除店铺收藏
+ * @param store_id
+ */
+export function deleteStoreCollection(store_id) {
+  return http.request({
+    url: `/member/collection/delete/STORE/${store_id}`,
+    method: Method.DELETE,
+    needToken: true,
+  });
+}
+
 /**
  * 获取商品是否被收藏
  * @param good_id
  */
-export function getGoodsIsCollect(good_id,type) {
+export function getGoodsIsCollect(type, good_id) {
   return http.request({
     url: `/member/collection/isCollection/${type}/${good_id}`,
     method: Method.GET,
@@ -228,7 +255,6 @@ export function getGoodsIsCollect(good_id,type) {
   });
 }
 
-
 /**
  * 收藏店铺
  * @param store_id 店铺ID
@@ -236,33 +262,20 @@ export function getGoodsIsCollect(good_id,type) {
  */
 export function collectionStore(store_id) {
   return http.request({
-    url: 'members/collection/store',
-    header:{'content-type':"application/x-www-form-urlencoded"},
+    url: "members/collection/store",
+    header: { "content-type": "application/x-www-form-urlencoded" },
     method: Method.POST,
     data: { store_id },
   });
 }
 
-/**
- * 删除店铺收藏
- * @param store_id
- */
-export function deleteStoreCollection(store_id) {
-  return http.request({
-    url: `members/collection/store/${store_id}`,
-    method: Method.DELETE,
-    needToken: true,
-  });
-}
-
-
 /**
  * 获取当前登录的用户信息
  * @returns {AxiosPromise}
  */
 export function getUserInfo() {
   return http.request({
-    url: '/members',
+    url: "/members",
     method: Method.GET,
     needToken: true,
   });
@@ -274,7 +287,7 @@ export function deleteStoreCollection(store_id) {
  */
 export function getUserWallet() {
   return http.request({
-    url: '/members/wallet',
+    url: "/members/wallet",
     method: Method.GET,
     needToken: true,
   });
@@ -287,30 +300,27 @@ export function getUserWallet() {
  */
 export function saveUserInfo(params) {
   return http.request({
-    url: '/members/editOwn',
+    url: "/members/editOwn",
     method: Method.PUT,
-	header:{'content-type':"application/x-www-form-urlencoded"},
+    header: { "content-type": "application/x-www-form-urlencoded" },
     needToken: true,
     data: params,
   });
 }
 
-
 /**
  * 添加发票
  * @param params
  */
 export function addReceipt(params) {
   return http.request({
-    url: '/trade/receipt',
+    url: "/trade/receipt",
     method: Method.POST,
     needToken: true,
     params,
   });
 }
 
-
-
 /**
  * 获取商品评论列表
  * @param goodsId
@@ -337,7 +347,6 @@ export function getGoodsCommentsCount(goodsId) {
   });
 }
 
-
 /**
  * 获取未读消息数量信息
  */
@@ -345,8 +354,8 @@ export function getNoReadMessageNum() {
   return http.request({
     url: `members/member-nocice-logs/number`,
     method: Method.GET,
-    needToken: true
-  })
+    needToken: true,
+  });
 }
 
 /**
@@ -359,7 +368,7 @@ export function myTrackList(params) {
     url: `/footprint`,
     method: Method.GET,
     needToken: true,
-	params
+    params,
   });
 }
 
@@ -371,8 +380,8 @@ export function deleteHistoryListId(ids) {
   return http.request({
     url: `/footprint/delByIds/${ids}`,
     method: Method.DELETE,
-    needToken: true
-  })
+    needToken: true,
+  });
 }
 
 /**
@@ -384,8 +393,8 @@ export function getMemberCoupons(data) {
     url: `/promotion/coupon/getCoupons`,
     method: Method.GET,
     needToken: true,
-    params:data
-  })
+    params: data,
+  });
 }
 
 /**
@@ -396,8 +405,8 @@ export function getCouponsNum() {
   return http.request({
     url: `/promotion/coupon/getCouponsNum`,
     method: Method.GET,
-    needToken: true
-  })
+    needToken: true,
+  });
 }
 
 /**
@@ -407,6 +416,6 @@ export function getCouponsNum() {
 export function getMemberPointSum() {
   return http.request({
     url: `member/memberPointsHistory/getMemberPointsHistoryVO`,
-    method: Method.GET
-  })
+    method: Method.GET,
+  });
 }

api/message.js

@@ -67,15 +67,28 @@ export function getLogisticsMessages(params) {
 
 
 /**
- * TODO 获取版本更新信息 暂无此功能。后续会优化更新
  * @param appType
  * @returns {AxiosPromise}
  * 
  */	
-export function getAppVersionList(appType) {
+ export function getAppVersion(appType) {
   return http.request({
     url: `/appVersion/${appType}`,
     method: Method.GET,
     type:"manager"
   });
 }
+
+/**
+ * @param appType
+ * @returns {AxiosPromise}
+ * 
+ */	
+ export function getAppVersionList(type,data) {
+  return http.request({
+    url: `/appVersion/appVersion/${type}`,
+    method: Method.GET,
+    type:"manager",
+    data
+  });
+}

api/promotions.js

@@ -1,8 +1,21 @@
 /**
  * 促销相关API
  */
-import {http, Method} from '@/utils/request.js';
+import { http, Method } from "@/utils/request.js";
 
+/**
+ * 获取当前直播列表
+ *
+ * @param {*}
+ * @returns
+ */
+export function getLiveList(params) {
+  return http.request({
+    url: `broadcast/studio`,
+    method: Method.GET,
+    params,
+  });
+}
 
 /**
  * 获取当前拼团活动的未成团的会员
@@ -14,24 +27,22 @@ export function getPromotionGroupMember(pintuanId) {
   });
 }
 
-
 /** 获取拼团列表 */
 export function getAssembleList(params) {
   return http.request({
-    url: 'promotion/pintuan',
+    url: "promotion/pintuan",
     method: Method.GET,
     loading: false,
-    params
-  })
+    params,
+  });
 }
 
-
 /**
  * 获取积分商城分类
  */
 export function getPointsCategory() {
   return http.request({
-    url: '/promotion/pointsGoods/category',
+    url: "/promotion/pointsGoods/category",
     method: Method.GET,
   });
 }
@@ -42,18 +53,30 @@ export function getPointsCategory() {
  */
  export function getPointsGoods(params) {
   return http.request({
-    url: '/promotion/pointsGoods',
+    url: "/promotion/pointsGoods",
     method: Method.GET,
     params,
   });
 }
+/**
+ * 获取积分商城商品详情
+ * @param params
+ */
+export function getPointsGoodsDetail(id) {
+  return http.request({
+    url: "/promotion/pointsGoods/"+id,
+    method: Method.GET,
+  });
+}
+
+
 
 /**
  * 获取限时抢购时间线 当天限时抢购信息
  */
 export function getSeckillTimeLine() {
   return http.request({
-    url: 'promotion/seckill',
+    url: "promotion/seckill",
     method: Method.GET,
   });
 }
@@ -75,8 +98,91 @@ export function getSeckillTimeGoods(timeline) {
  */
 export function getAllCoupons(params) {
   return http.request({
-    url: '/promotion/coupon',
+    url: "/promotion/coupon",
     method: Method.GET,
     params,
   });
 }
+
+/**
+ * 分页获取砍价商品
+ * @param params
+ */
+export function getBargainList(params) {
+  return http.request({
+    url: "/promotion/kanjiaGoods",
+    method: Method.GET,
+    params,
+  });
+}
+
+/**
+ * 分页获取砍价商品
+ * @param params
+ */
+export function getBargainDetail(id) {
+  return http.request({
+    url: `/promotion/kanjiaGoods/${id}`,
+    method: Method.GET,
+  });
+}
+
+/**
+ * 获取砍价活动
+ * @param params
+ */
+export function getBargainActivity(params) {
+  return http.request({
+    url: `/promotion/kanjiaGoods/getKanjiaActivity`,
+    method: Method.POST,
+    params,
+  });
+}
+
+/**
+ * 发起砍价活动
+ * @param params
+ */
+export function openBargain(params) {
+  return http.request({
+    url: `/promotion/kanjiaGoods`,
+    method: Method.POST,
+    header: { "content-type": "application/x-www-form-urlencoded" },
+    data: params,
+  });
+}
+
+/**
+ * 分页获取砍价活动-帮砍记录
+ */
+export function getBargainLog(params) {
+  return http.request({
+    url: `/promotion/kanjiaGoods/getKanjiaActivity/logs`,
+    method: Method.GET,
+    data: params,
+  });
+}
+
+
+/**
+ * 分页获取砍价活动-帮砍记录
+ */
+ export function helpBargain(kanJiaActivityId) {
+  return http.request({
+    url: `promotion/kanjiaGoods/help/${kanJiaActivityId}`,
+    method: Method.POST,
+  });
+}
+
+/**
+ * 分页获取已参与的砍价活动
+ */
+export function getMineBargainLog(params) {
+  return http.request({
+    url: `/promotion/kanjiaGoods/kanjiaActivity/mine/`,
+    method: Method.GET,
+    params
+  });
+}
+
+

api/store.js

@@ -20,10 +20,37 @@ export function getstoreList(params) {
  * 获取店铺基本信息
  * @param storeId
  */
-export function getstoreBaseInfo(storeId) {
+ export function getStoreBaseInfo(storeId) {
   return http.request({
     url: `/store/get/detail/${storeId}`,
     method: Method.GET,
     loading: false,
   });
 }
+
+/**
+ * 获取店铺分类
+ * @param id
+ */
+ export function getStoreCategory(id) {
+  return http.request({
+    url: `/store/label/get/${id}`,
+    method: Method.GET,
+  });
+}
+
+
+/**
+ * 营业执照
+ * @param id
+ */
+ export function getLicencePhoto(id) {
+  return http.request({
+    url: `/store/get/licencePhoto/${id}`,
+    method: Method.GET,
+  });
+}
+
+
+
+

components/m-buy/README.md

@@ -0,0 +1,3 @@
+## 购买组件
+1.本组件是砍价，积分购买，参团等复用组
+2.后续会将此组件和商品购买组件合并，文档后续再出

components/m-buy/goods.vue

@@ -0,0 +1,424 @@
+<template>
+  <div class="wrapper">
+    <u-popup class="popup" v-model="buyMask" :height="setup.height" closeable :mode="setup.mode"
+      :mask-close-able="isClose" :mask="isMask" :border-radius="setup.radius" @close="closeMask()">
+      <!-- 商品 -->
+      <view class="goods-box bottom">
+        <view class="goods-header">
+          <view class="goods-img">
+            <u-image width="200rpx" border-radius="20" class="uimage" height="200rpx"
+              :src="selectedSpecImg ? selectedSpecImg : goodsDetail.thumbnail"></u-image>
+          </view>
+          <view class="goods-skus">
+            <!-- 有活动商品价格 -->
+            <view class="goods-price " v-if="goodsDetail.promotionPrice">
+              <span>
+                ￥
+                <span class="goods-price-promotionShow goods-price-bigshow"
+                  v-if="goodsDetail.promotionPrice">{{ formatPrice(goodsDetail.promotionPrice)[0] }}</span>
+                .{{ formatPrice(goodsDetail.promotionPrice)[1] }}
+                <span></span>
+              </span>
+              <div class="promotion-box">
+                ￥
+                <span class="goods-price-bigshow">{{
+                formatPrice(goodsDetail.price)[0]
+              }}</span>
+                .{{ formatPrice(goodsDetail.price)[1] }}
+
+              </div>
+            </view>
+            <!-- 正常商品的价格 -->
+            <view class="goods-price" v-else>
+              <span>
+                ￥
+                <span class="goods-price-bigshow">{{
+                formatPrice(goodsDetail.price)[0]
+              }}</span>
+                .{{ formatPrice(goodsDetail.price)[1] }}
+              </span>
+            </view>
+            <view class="goods-check-skus">
+              已选
+              <span class="goods-check-skus-name">
+                {{ selectName }}
+                <span>，{{ num }}个</span>
+              </span>
+            </view>
+          </view>
+        </view>
+        <!-- 商品信息 -->
+        <view class="goods-skus-box">
+          <!-- 规格 -->
+          <view class="goods-skus-view" :key="specIndex" v-for="(spec, specIndex) in formatList">
+            <view class="skus-view-list">
+              <view class="view-class-title">{{ spec.name }}</view>
+              <view :class="{ active: spec_val.value == currentSelceted[specIndex] }" class="skus-view-item"
+                v-for="(spec_val, spec_index) in spec.values" :key="spec_index"
+                @click="handleClickSpec(spec, specIndex, spec_val)">{{ spec_val.value }}</view>
+            </view>
+          </view>
+          <!-- 数量 -->
+          <view class="goods-skus-number">
+            <view class="view-class-title">数量</view>
+            <u-number-box :bg-color="numberBox.bgColor" :color="numberBox.color" :input-width="numberBox.width"
+              :input-height="numberBox.height" :size="numberBox.size" :min="1" v-model="num">
+            </u-number-box>
+          </view>
+        </view>
+        <!-- 按钮 -->
+        <view class="btns">
+
+          <view class="box-btn card" v-if="buyType != 'PINTUAN' && goodsDetail.goodsType!='VIRTUAL_GOODS'"
+            @click="addToCartOrBuy('cart')">加入购物车</view>
+          <view class="box-btn buy" @click="addToCartOrBuy('buy')">立即购买</view>
+        </view>
+      </view>
+    </u-popup>
+  </div>
+</template>
+<script>
+import * as API_trade from "@/api/trade.js";
+import setup from "./popup";
+export default {
+  data() {
+    return {
+      setup,
+      num: 1,
+      // 步进器的大小尺寸单位是 rpx
+      numberBox: {
+        width: "50",
+        height: "50",
+        size: "22",
+        color: "#333",
+        bgColor: "#fff",
+      },
+      selectName: "", //选中商品的昵称
+      selectSkuList: "", //选中商铺sku,
+      selectedSpecImg: "", //选中的图片路径
+      buyType: "", //用于存储促销，拼团等活动类型
+      parentOrder: "", //父级拼团活动的数据 - 如果是团员则有数据
+      formatList: [],
+      currentSelceted: [],
+      skuList: "",
+      isMask: false, //是否显示遮罩层
+      isClose: false, //是否可以点击遮罩关闭
+    };
+  },
+  props: [
+    "goodsDetail", //商品详情
+    "buyMask",
+    "selectedSku",
+    "goodsSpec",
+    "addr",
+  ],
+  watch: {
+    buyType: {
+      handler(val) {
+        this.buyType = val;
+      },
+      immediate: true,
+    },
+    selectSkuList: {
+      handler(val) {
+        this.$emit("changed", val);
+      },
+      deep: true,
+    },
+  },
+
+  methods: {
+    // 格式化金钱  1999 --> [1999,00]
+    formatPrice(val) {
+      if (typeof val == "undefined") {
+        return val;
+      }
+      return val.toFixed(2).split(".");
+    },
+
+    closeMask() {
+      this.$emit("closeBuy", false);
+    },
+
+    /**点击规格 */
+    handleClickSpec(val, index, specValue) {
+      this.$set(this.currentSelceted, index, specValue.value);
+      let selectedSkuId = this.goodsSpec.find((i) => {
+        let matched = true;
+        let specValues = i.specValues.filter((j) => j.specName !== "images");
+        for (let n = 0; n < specValues.length; n++) {
+          if (specValues[n].specValue !== this.currentSelceted[n]) {
+            matched = false;
+            return;
+          }
+        }
+        if (matched) {
+          return i;
+        }
+      });
+      this.selectSkuList = {
+        spec: {
+          specName: val.name,
+          specValue: specValue.value,
+        },
+        data: this.goodsDetail,
+      };
+      this.selectName = specValue.value;
+
+      this.$emit("handleClickSku", {
+        skuId: selectedSkuId.skuId,
+        goodsId: this.goodsDetail.goodsId,
+      });
+    },
+
+    /**
+     * 添加到购物车或购买
+     */
+    addToCartOrBuy(val) {
+      if (!this.selectSkuList) {
+        uni.showToast({
+          title: "请选择规格商品",
+          icon: "none",
+        });
+        return;
+      }
+      let data = {
+        skuId: this.goodsDetail.id,
+        num: this.num,
+      };
+
+      if (val == "cart") {
+        API_trade.addToCart(data).then((res) => {
+          if (res.data.code == 200) {
+            uni.showToast({
+              title: "商品已添加到购物车",
+              icon: "none",
+            });
+
+            this.$emit("queryCart");
+            this.closeMask();
+          }
+        });
+      } else {
+        // 判断是否拼团商品
+        if (this.buyType) {
+          data.cartType = "PINTUAN";
+        } else if (this.goodsDetail.goodsType == "VIRTUAL_GOODS") {
+          data.cartType = "VIRTUAL";
+        } else {
+          data.cartType = "BUY_NOW";
+        }
+
+        API_trade.addToCart(data).then((res) => {
+          if (res.data.code == 200) {
+            uni.navigateTo({
+              url: `/pages/order/fillorder?way=${data.cartType}&addr=${
+                this.addr.id || ""
+              }&parentOrder=${encodeURIComponent(
+                JSON.stringify(this.parentOrder)
+              )}`,
+            });
+          }
+        });
+      }
+    },
+
+    /**
+     * 直接购买
+     */
+    buy(data) {
+      API_trade.addToCart(data).then((res) => {
+        if (res.data.success) {
+          uni.navigateTo({
+            url: `/pages/order/fillorder?way=${
+              data.cartType
+            }&addr=${""}&parentOrder=${encodeURIComponent(
+              JSON.stringify(this.parentOrder)
+            )}`,
+          });
+        }
+      });
+    },
+
+    formatSku(list) {
+      // 格式化数据
+      if (!Array.isArray(list)) return false;
+      let arr = [{}];
+      list.forEach((item, index) => {
+        item.specValues.forEach((spec, specIndex) => {
+          let name = spec.specName;
+          let values = {
+            value: spec.specValue,
+            quantity: item.quantity,
+          };
+          if (name === "images") {
+            return;
+          }
+
+          arr.forEach((arrItem, arrIndex) => {
+            if (
+              arrItem.name == name &&
+              arrItem.values &&
+              !arrItem.values.find((i) => i.value === values.value)
+            ) {
+              arrItem.values.push(values);
+            }
+
+            let keys = arr.map((key) => {
+              return key.name;
+            });
+            if (!keys.includes(name)) {
+              arr.push({
+                name: name,
+                values: [values],
+              });
+            }
+          });
+        });
+      });
+      arr.shift();
+      this.formatList = arr;
+
+      list.forEach((item) => {
+        if (item.skuId === this.goodsDetail.id) {
+          item.specValues
+            .filter((i) => i.specName !== "images")
+            .forEach((value, _index) => {
+              this.currentSelceted[_index] = value.specValue;
+              this.selectName = value.specValue;
+              this.selectSkuList = {
+                spec: value,
+                data: this.goodsDetail,
+              };
+            });
+        }
+      });
+
+      this.skuList = list;
+    },
+  },
+
+  mounted() {
+    this.formatSku(this.goodsSpec);
+
+    console.log(this.goodsDetail);
+  },
+};
+</script>
+<style lang="scss" scoped>
+@import "./popup.scss";
+
+.buy {
+  background-image: linear-gradient(135deg, #ffba0d, #ffc30d 69%, #ffcf0d);
+  box-shadow: 0 2px 6px 0 rgba(255, 65, 66, 0.2);
+}
+
+.card {
+  background-image: linear-gradient(135deg, #f2140c, #f2270c 70%, #f24d0c);
+  box-shadow: 0 2px 6px 0 rgba(255, 65, 66, 0.2);
+}
+
+/deep/.u-icon-plus,
+.u-icon-minus,
+.u-icon-disabled {
+  height: 30rpx !important;
+  background: #fff !important;
+}
+
+.goods-skus-number {
+  justify-content: space-between;
+  display: flex;
+}
+
+/deep/ .uni-scroll-view {
+  overflow: hidden !important;
+}
+
+.active {
+  background: $price-light-color !important;
+  border: 2rpx solid $price-color;
+  font-weight: bold;
+  color: $price-color !important;
+  box-sizing: border-box;
+}
+
+.goods-skus-box {
+  overflow-y: auto;
+  height: 610rpx;
+  // #ifdef MP-WEIXIN
+  height: 570rpx;
+  // #endif
+  margin-bottom: 10rpx;
+}
+
+.goods-skus-view {
+  overflow: hidden;
+
+  .skus-view-list {
+    > .skus-view-item {
+      flex: 1;
+      padding: 0 36rpx;
+
+      overflow: hidden;
+      height: 60rpx;
+      line-height: 60rpx;
+      float: left;
+      text-align: center;
+      margin-left: 24rpx;
+      margin-bottom: 20rpx;
+      font-size: 22rpx;
+      color: #262626;
+      background: #f2f2f2;
+      border-radius: 30rpx;
+    }
+  }
+}
+
+.goods-header {
+  height: 200rpx;
+  display: flex;
+  align-items: center;
+  margin-bottom: 36rpx;
+}
+
+.goods-box {
+  padding: 50rpx 36rpx 0 36rpx;
+}
+
+.goods-skus {
+  padding: 0 20rpx;
+}
+
+.goods-price {
+  color: $price-color;
+  line-height: 80rpx;
+  display: flex;
+}
+.promotion-box {
+  line-height: 1;
+  display: flex;
+  align-items: center;
+  text-decoration: line-through;
+  color: #999;
+  margin-left: 10rpx;
+  /deep/ span {
+    font-size: 30rpx;
+  }
+}
+.promotion {
+  font-size: 30rpx;
+}
+.goods-price-promotionShow {
+  font-size: 48rpx;
+}
+.goods-check-skus {
+  font-size: 24rpx;
+  color: #999;
+  > .goods-check-skus-name {
+    margin-left: 4rpx;
+  }
+  > span {
+    color: #333;
+  }
+}
+</style>

components/m-buy/popup.js

@@ -0,0 +1,8 @@
+
+
+export default {
+    height:"1000rpx", //弹出层高度
+    mode:"bottom", //弹出层位置
+    radius:"32", //圆角 rpx,
+    close:false //能否点击遮罩退出
+}

components/m-buy/popup.scss

@@ -0,0 +1,37 @@
+.view-class-title {
+    font-size: 26rpx;
+    color: #262626;
+
+    font-weight: 700;
+    height: 80rpx;
+    line-height: 80rpx;
+}
+.confirmBtn {
+    width: 90%;
+}
+.confirmBtn,
+.box-btn {
+    line-height: 80rpx;
+    height: 80rpx;
+    
+    background: $price-color;
+    color: #fff;
+    border-radius: 200px;
+    text-align: center;
+    margin: 5rpx auto;
+}
+
+.btns {
+    display: flex;
+    width: 100%;
+
+    margin: 0 auto;
+}
+.goods-price-bigshow {
+    font-size: 48rpx;
+    font-weight: bold;
+}
+.box-btn {
+    flex: 1;
+    margin: 0 10rpx;
+}

components/m-goods-recommend/README.md

@@ -0,0 +1,10 @@
+## 商品推荐 
+
+
+### OBJECT 参数说明
+属性|说明|类型|必填
+---|---|---|---
+`title`|标题，用于顶部显示的内容|String|否
+`pageSize`|显示多少条数据，建议是2的倍数,默认为12条|*|否
+`categoryId`|分类id|Function|否
+`storeId`|卖家id，搜索店铺商品的时候使用|String|否

components/m-goods-recommend/index.vue

@@ -0,0 +1,152 @@
+<template>
+  <div>
+    <div class="goods-recommend">{{title ? `--${title}-- `:''}}</div>
+    <div class="goods-list">
+      <div @click="handleClick(item)" class="goods-item" v-for="(item, item_index) in goodsList" :key="item_index">
+        <div class="goods-img">
+          <u-image :src="item.content.thumbnail" mode="aspectFill" height="350rpx" width="100%">
+            <u-loading slot="loading"></u-loading>
+          </u-image>
+        </div>
+        <div class="goods-desc">
+          <div class="goods-title">
+            {{ item.content.goodsName }}
+          </div>
+          <div class="goods-bottom">
+            <div class="goods-price">￥{{ item.content.price | unitPrice }}</div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { getGoodsList } from "@/api/goods.js";
+export default {
+  data() {
+    return {
+      goodsList: [],
+      params: {
+        pageNumber: 1,
+      },
+    };
+  },
+  props: {
+    title: {
+      type: String,
+      default: "",
+    },
+    pageSize: {
+      type: null,
+      default: 12,
+    },
+    categoryId: {
+      type: null,
+      default: "",
+    },
+    storeId: {
+      type: null,
+      default: "",
+    },
+  },
+  mounted() {
+    this.initGoods();
+  },
+  methods: {
+    /**
+     * 初始化商品
+     */
+    async initGoods() {
+      let submit = JSON.parse(
+        JSON.stringify(
+          Object.assign(this.params, {
+            pageSize: this.pageSize,
+            categoryId: this.categoryId,
+            storeId: this.storeId,
+          })
+        )
+      );
+
+      Object.keys(submit).map((key) => {
+        if (!submit[key] || submit[key].length == 0) {
+          delete submit[key];
+        }
+      });
+      let goodsList = await getGoodsList(submit);
+      this.goodsList.push(...goodsList.data.result.content);
+    },
+    handleClick(item) {
+      uni.navigateTo({
+        url: `/pages/product/goods?id=${item.content.id}&goodsId=${item.content.goodsId}`,
+      });
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+/**商品代码 */
+$w_94: 94%;
+.goods-recommend {
+  background: #f7f7f7;
+  height: 100rpx;
+  line-height: 100rpx;
+  text-align: center;
+  font-size: 30rpx;
+  font-weight: bold;
+}
+.goods-list {
+  display: flex;
+  flex-wrap: wrap;
+  background: #f7f7f7;
+}
+.goods-item {
+  width: 50%;
+  margin-bottom: 10px;
+  border-radius: 0.4em;
+  overflow: hidden;
+}
+.goods-img {
+  position: relative;
+  margin: 0 auto;
+  width: $w_94;
+  height: 350rpx;
+  border-top-left-radius: 20rpx;
+  border-top-right-radius: 20rpx;
+  overflow: hidden;
+  > img {
+    width: 100%;
+    height: 100%;
+  }
+}
+.goods-desc {
+  border-bottom-left-radius: 20rpx;
+  border-bottom-right-radius: 20rpx;
+  width: $w_94;
+  background: #fff;
+  padding: 8rpx 0 8rpx 8rpx;
+  margin: 0 auto;
+  > .goods-title {
+    font-size: 12px;
+    height: 70rpx;
+    display: -webkit-box;
+    font-weight: 500;
+    -webkit-box-orient: vertical;
+
+    -webkit-line-clamp: 2;
+
+    overflow: hidden;
+  }
+
+  > .goods-bottom {
+    display: flex;
+    font-weight: bold;
+
+    > .goods-price {
+      line-height: 2;
+      color: $main-color;
+    }
+  }
+}
+</style>

components/m-share/index.vue

@@ -58,13 +58,6 @@ export default {
   // 图片缩略图、 商品名称 、 type（goods,shop,pintuan) 拼团商品分享以及店铺分享
 
   props: ["thumbnail", "goodsName", "type", "goodsId", "link"],
-  // #ifdef MP-WEIXIN
-  onShareAppMessage(res) {
-    return {
-      imageUrl: this.thumbnail || require("@/static/logo.png"),
-    };
-  },
-  // #endif
   methods: {
     close() {
       this.$emit("close");
@@ -72,10 +65,14 @@ export default {
     // h5复制链接
     // #ifdef H5
     copyLink() {
-      let content =
+      let content;
+      if (this.link) {
+        content = this.configs.shareLink + this.link;
+      } else {
+        content =
           this.configs.shareLink +
           getCurrentPages()[getCurrentPages().length - 1].__page__.fullPath;
-
+      }
       if (content === null || content === undefined) {
         content = "";
       } else content = content + "";
@@ -93,19 +90,24 @@ export default {
     },
     // #endif
 
-    // #ifdef APP-PLUS
-    handleShare(val) {
-      if (val.type <= 1) {
+    shareTitle() {
       let shareTitle;
-
       if (this.type == "goods") {
         shareTitle = `我发现了一个${this.goodsName}商品快来跟我一起看看吧`;
       } else if (this.type == "shops") {
         shareTitle = `我发现了一个${this.goodsName}店铺快来跟我一起看看吧`;
       } else if (this.type == "pintuan") {
         shareTitle = `我拼了一个${this.goodsName}快来跟我一起抢购吧!`;
+      } else if (this.type == "kanjia") {
+        shareTitle = `请快来帮我砍一刀${this.goodsName}`;
       }
+      return shareTitle;
+    },
 
+    // #ifdef APP-PLUS
+    handleShare(val) {
+      console.log("12312312")
+      if (val.type <= 1) {
         let scene; //  "WXSenceTimeline 朋友圈   WXSceneSession 微信好友"
         val.type == 1
           ? (scene = "WXSenceTimeline")
@@ -113,11 +115,11 @@ export default {
         uni.share({
           provider: "weixin",
           scene: scene,
-          href: configs.downloadLink + this.link,
+          href: configs.shareLink + this.link,
           imageUrl: this.thumbnail,
           type: 0,
           summary: this.goodsName,
-          title: shareTitle,
+          title: this.shareTitle(),
           success: function (res) {
             uni.showToast({
               title: "分享成功!",

components/popups/popups.vue

@@ -0,0 +1,343 @@
+<template>
+  <view class="shadow" :class="!show?'':'shadow-show'" :style="{backgroundColor:show?maskBg:'rgba(0,0,0,0)'}" @tap="tapMask">
+    <view class="popups" :class="[theme]" :style="{top: popupsTop ,left: popupsLeft,flexDirection:direction}">
+      <text :class="dynPlace" :style="{width:'0px',height:'0px'}" v-if="triangle"></text>
+      <view v-for="(item,index) in popData" :key="index" @tap.stop="tapItem(item)" class="itemChild view" :class="[direction=='row'?'solid-right':'solid-bottom',item.disabled?'disabledColor':'']">
+        <u-icon size="35" :name="item.icon" v-if="item.icon"></u-icon><span class="title">{{item.title}}</span>
+      </view>
+      <slot></slot>
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+  props: {
+    maskBg: {
+      type: String,
+      default: "rgba(0,0,0,0)",
+    },
+    placement: {
+      type: String,
+      default: "default", //default top-start top-end bottom-start bottom-end
+    },
+    direction: {
+      type: String,
+      default: "column", //column row
+    },
+    x: {
+      type: Number,
+      default: 0,
+    },
+    y: {
+      type: Number,
+      default: 0,
+    },
+    value: {
+      type: Boolean,
+      default: false,
+    },
+    popData: {
+      type: Array,
+      default: () => [],
+    },
+    theme: {
+      type: String,
+      default: "light", //light dark
+    },
+    dynamic: {
+      type: Boolean,
+      default: false,
+    },
+    gap: {
+      type: Number,
+      default: 20,
+    },
+    triangle: {
+      type: Boolean,
+      default: true,
+    },
+  },
+  data() {
+    return {
+      popupsTop: "0rpx",
+      popupsLeft: "0rpx",
+      show: false,
+      dynPlace: "",
+    };
+  },
+  mounted() {
+    this.popupsPosition();
+  },
+  methods: {
+    tapMask() {
+      this.$emit("input", !this.value);
+    },
+    tapItem(item) {
+      if (item.disabled) return;
+      this.$emit("tapPopup", item);
+      this.$emit("input", !this.value);
+    },
+    getStatusBar() {
+      let promise = new Promise((resolve, reject) => {
+        uni.getSystemInfo({
+          success: function (e) {
+            let customBar;
+            // #ifdef H5
+
+            customBar = e.statusBarHeight + e.windowTop;
+
+            // #endif
+            resolve(customBar);
+          },
+        });
+      });
+      return promise;
+    },
+    async popupsPosition() {
+      let statusBar = await this.getStatusBar();
+      let promise = new Promise((resolve, reject) => {
+        let popupsDom = uni.createSelectorQuery().in(this).select(".popups");
+        popupsDom
+          .fields(
+            {
+              size: true,
+            },
+            (data) => {
+              let width = data.width;
+              let height = data.height;
+
+             
+
+              let y = this.dynamic
+                ? this.dynamicGetY(this.y, this.gap)
+                : this.transformRpx(this.y);
+
+              let x = this.dynamic
+                ? this.dynamicGetX(this.x, this.gap)
+                : this.transformRpx(this.x);
+
+              // #ifdef H5
+              y = this.dynamic
+                ? this.y + statusBar
+                : this.transformRpx(this.y + statusBar);
+              // #endif
+
+              this.dynPlace =
+                this.placement == "default"
+                  ? this.getPlacement(x, y)
+                  : this.placement;
+
+              switch (this.dynPlace) {
+                case "top-start":
+                  this.popupsTop = `${y + 9}rpx`;
+                  this.popupsLeft = `${x - 15}rpx`;
+                  break;
+                case "top-end":
+                  this.popupsTop = `${y + 9}rpx`;
+                  this.popupsLeft = `${x + 15 - width}rpx`;
+                  break;
+                case "bottom-start":
+                  this.popupsTop = `${y - 18 - height}rpx`;
+                  this.popupsLeft = `${x - 15}rpx`;
+                  break;
+                case "bottom-end":
+                  this.popupsTop = `${y - 9 - height}rpx`;
+                  this.popupsLeft = `${x + 15 - width}rpx`;
+                  break;
+              }
+              resolve();
+            }
+          )
+          .exec();
+      });
+      return promise;
+    },
+    getPlacement(x, y) {
+      let width = uni.getSystemInfoSync().windowWidth;
+      let height = uni.getSystemInfoSync().windowHeight;
+      if (x > width / 2 && y > height / 2) {
+        return "bottom-end";
+      } else if (x < width / 2 && y < height / 2) {
+        return "top-start";
+      } else if (x > width / 2 && y < height / 2) {
+        return "top-end";
+      } else if (x < width / 2 && y > height / 2) {
+        return "bottom-start";
+      } else if (x > width / 2) {
+        return "top-end";
+      } else {
+        return "top-start";
+      }
+    },
+    dynamicGetY(y, gap) {
+      let height = uni.getSystemInfoSync().windowHeight;
+      y = y < gap ? gap : y;
+      y = height - y < gap ? height - gap : y;
+
+      return y;
+    },
+    dynamicGetX(x, gap) {
+      let width = uni.getSystemInfoSync().windowWidth;
+      x = x < gap ? gap : x;
+      x = width - x < gap ? width - gap : x;
+      return x;
+    },
+    transformRpx(params) {
+      return (params * uni.getSystemInfoSync().screenWidth) / 375;
+    },
+  },
+  watch: {
+    value: {
+      immediate: true,
+      handler: async function (newVal, oldVal) {
+        if (newVal) await this.popupsPosition();
+        this.show = newVal;
+      },
+    },
+    placement: {
+      immediate: true,
+      handler(newVal, oldVal) {
+        this.dynPlace = newVal;
+      },
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.title {
+  margin-left: 20rpx;
+}
+.shadow {
+  position: fixed;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  height: 100%;
+  z-index: 9999;
+  transition: background 0.3s ease-in-out;
+  visibility: hidden;
+
+  &.shadow-show {
+    visibility: visible;
+  }
+}
+
+.popups {
+  position: absolute;
+  padding: 20rpx;
+  border-radius: 5px;
+  display: flex;
+  .view {
+    display: flex;
+    align-items: center;
+    padding: 15rpx 10rpx;
+    font-size: 25rpx;
+  }
+  .image {
+    display: inline-block;
+    vertical-align: middle;
+    width: 40rpx;
+    height: 40rpx;
+    margin-right: 20rpx;
+  }
+}
+.dark {
+  background-color: #4c4c4c;
+  color: #fff;
+  .top-start:after {
+    content: "";
+    position: absolute;
+    top: -18rpx;
+    left: 10rpx;
+    border-width: 0 20rpx 20rpx;
+    border-style: solid;
+    border-color: transparent transparent #4c4c4c;
+  }
+  .top-end:after {
+    content: "";
+    position: absolute;
+    top: -18rpx;
+    right: 10rpx;
+    border-width: 0 20rpx 20rpx;
+    border-style: solid;
+    border-color: transparent transparent #4c4c4c;
+  }
+  .bottom-start:after {
+    content: "";
+    position: absolute;
+    bottom: -18rpx;
+    left: 10rpx;
+    border-width: 20rpx 20rpx 0;
+    border-style: solid;
+    border-color: #4c4c4c transparent transparent;
+  }
+  .bottom-end:after {
+    content: "";
+    position: absolute;
+    bottom: -18rpx;
+    right: 10rpx;
+    border-width: 20rpx 20rpx 0;
+    border-style: solid;
+    border-color: #4c4c4c transparent transparent;
+  }
+  .disabledColor {
+    color: #c5c8ce;
+  }
+}
+.light {
+  color: #515a6e;
+  box-shadow: 0upx 0upx 30upx rgba(0, 0, 0, 0.2);
+  background: #fff;
+  .top-start:after {
+    content: "";
+    position: absolute;
+    top: -18rpx;
+    left: 10rpx;
+    border-width: 0 20rpx 20rpx;
+    border-style: solid;
+    border-color: transparent transparent #fff;
+  }
+  .top-end:after {
+    content: "";
+    position: absolute;
+    top: -18rpx;
+    right: 10rpx;
+    border-width: 0 20rpx 20rpx;
+    border-style: solid;
+    border-color: transparent transparent #fff;
+  }
+  .bottom-start:after {
+    content: "";
+    position: absolute;
+    bottom: -18rpx;
+    left: 10rpx;
+    border-width: 20rpx 20rpx 0;
+    border-style: solid;
+    border-color: #fff transparent transparent;
+  }
+  .bottom-end:after {
+    content: "";
+    position: absolute;
+    bottom: -18rpx;
+    right: 10rpx;
+    border-width: 20rpx 20rpx 0;
+    border-style: solid;
+    border-color: #fff transparent transparent;
+  }
+  .disabledColor {
+    color: #c5c8ce;
+  }
+}
+.solid-bottom {
+  border-bottom: 1px solid #f3f5f7;
+}
+.solid-right {
+  border-right: 1px solid #ccc;
+}
+.popups .itemChild:last-child {
+  border: none;
+}
+</style>

components/uni-badge/uni-badge.vue

@@ -1,151 +0,0 @@
-<template>
-	<text v-if="text" :class="inverted ? 'uni-badge--' + type + ' uni-badge--' + size + ' uni-badge--' + type + '-inverted' : 'uni-badge--' + type + ' uni-badge--' + size"
-	 :style="badgeStyle" class="uni-badge" @click="onClick()">{{ text }}</text>
-</template>
-
-<script>
-	/**
-	 * Badge 数字角标
-	 * @description 数字角标一般和其它控件（列表、9宫格等）配合使用，用于进行数量提示，默认为实心灰色背景
-	 * @tutorial https://ext.dcloud.net.cn/plugin?id=21
-	 * @property {String} text 角标内容
-	 * @property {String} type = [default|primary|success|warning|error] 颜色类型
-	 * 	@value default 灰色
-	 * 	@value primary 蓝色
-	 * 	@value success 绿色
-	 * 	@value warning 黄色
-	 * 	@value error 红色
-	 * @property {String} size = [normal|small] Badge 大小
-	 * 	@value normal 一般尺寸
-	 * 	@value small 小尺寸
-	 * @property {String} inverted = [true|false] 是否无需背景颜色
-	 * @event {Function} click 点击 Badge 触发事件
-	 * @example <uni-badge text="1"></uni-badge>
-	 */
-	export default {
-		name: 'UniBadge',
-		props: {
-			type: {
-				type: String,
-				default: 'default'
-			},
-			inverted: {
-				type: Boolean,
-				default: false
-			},
-			text: {
-				type: [String, Number],
-				default: ''
-			},
-			size: {
-				type: String,
-				default: 'normal'
-			}
-		},
-		data() {
-			return {
-				badgeStyle: ''
-			};
-		},
-		watch: {
-			text() {
-				this.setStyle()
-			}
-		},
-		mounted() {
-			this.setStyle()
-		},
-		methods: {
-			setStyle() {
-				this.badgeStyle = `width: ${String(this.text).length * 8 + 12}px`
-			},
-			onClick() {
-				this.$emit('click');
-			}
-		}
-	};
-</script>
-
-<style lang="scss" scoped>
-	$bage-size: 12px;
-	$bage-small: scale(0.8);
-	$bage-height: 20px;
-
-	.uni-badge {
-		/* #ifndef APP-PLUS */
-		display: flex;
-		/* #endif */
-		justify-content: center;
-		flex-direction: row;
-		height: $bage-height;
-		line-height: $bage-height;
-		color: $uni-text-color;
-		border-radius: 100px;
-		background-color: $uni-bg-color-hover;
-		background-color: transparent;
-		text-align: center;
-		font-family: 'Helvetica Neue', Helvetica, sans-serif;
-		font-size: $bage-size;
-		padding: 0px 6px;
-	}
-
-	.uni-badge--inverted {
-		padding: 0 5px 0 0;
-		color: $uni-bg-color-hover;
-	}
-
-	.uni-badge--default {
-		color: $uni-text-color;
-		background-color: $uni-bg-color-hover;
-	}
-
-	.uni-badge--default-inverted {
-		color: $uni-text-color-grey;
-		background-color: transparent;
-	}
-
-	.uni-badge--primary {
-		color: $uni-text-color-inverse;
-		background-color: $uni-color-primary;
-	}
-
-	.uni-badge--primary-inverted {
-		color: $uni-color-primary;
-		background-color: transparent;
-	}
-
-	.uni-badge--success {
-		color: $uni-text-color-inverse;
-		background-color: $uni-color-success;
-	}
-
-	.uni-badge--success-inverted {
-		color: $uni-color-success;
-		background-color: transparent;
-	}
-
-	.uni-badge--warning {
-		color: $uni-text-color-inverse;
-		background-color: $uni-color-warning;
-	}
-
-	.uni-badge--warning-inverted {
-		color: $uni-color-warning;
-		background-color: transparent;
-	}
-
-	.uni-badge--error {
-		color: $uni-text-color-inverse;
-		background-color: $uni-color-error;
-	}
-
-	.uni-badge--error-inverted {
-		color: $uni-color-error;
-		background-color: transparent;
-	}
-
-	.uni-badge--small {
-		transform: $bage-small;
-		transform-origin: center center;
-	}
-</style>

components/uni-drawer/uni-drawer.vue

@@ -1,170 +0,0 @@
-<template>
-	<view v-if="visibleSync" :class="{ 'uni-drawer--visible': showDrawer }" class="uni-drawer" @touchmove.stop.prevent="clear">
-		<view class="uni-drawer__mask" :class="{ 'uni-drawer__mask--visible': showDrawer && mask }" @tap="close('mask')" />
-		<view class="uni-drawer__content" :class="{'uni-drawer--right': rightMode,'uni-drawer--left': !rightMode, 'uni-drawer__content--visible': showDrawer}" :style="{width:drawerWidth+'px'}">
-			<slot />
-		</view>
-	</view>
-</template>
-
-<script>
-	/**
-	 * Drawer 抽屉
-	 * @description 抽屉侧滑菜单
-	 * @tutorial https://ext.dcloud.net.cn/plugin?id=26
-	 * @property {Boolean} mask = [true | false] 是否显示遮罩
-	 * @property {Boolean} maskClick = [true | false] 点击遮罩是否关闭
-	 * @property {Boolean} mode = [left | right] Drawer 滑出位置
-	 * 	@value left 从左侧滑出
-	 * 	@value right 从右侧侧滑出
-	 * @property {Number} width 抽屉的宽度 ，仅 vue 页面生效
-	 * @event {Function} close 组件关闭时触发事件
-	 */
-	export default {
-		name: 'UniDrawer',
-		props: {
-			/**
-			 * 显示模式（左、右），只在初始化生效
-			 */
-			mode: {
-				type: String,
-				default: ''
-			},
-			/**
-			 * 蒙层显示状态
-			 */
-			mask: {
-				type: Boolean,
-				default: true
-			},
-			/**
-			 * 遮罩是否可点击关闭
-			 */
-			maskClick:{
-				type: Boolean,
-				default: true
-			},
-			/**
-			 * 抽屉宽度
-			 */
-			width: {
-				type: Number,
-				default: 220
-			}
-		},
-		data() {
-			return {
-				visibleSync: false,
-				showDrawer: false,
-				rightMode: false,
-				watchTimer: null,
-				drawerWidth: 220
-			}
-		},
-		created() {
-			// #ifndef APP-NVUE
-			this.drawerWidth = this.width
-			// #endif
-			this.rightMode = this.mode === 'right'
-		},
-		methods: {
-			clear(){},
-			close(type) {
-				// fixed by mehaotian 抽屉尚未完全关闭或遮罩禁止点击时不触发以下逻辑
-				if((type === 'mask' && !this.maskClick) || !this.visibleSync) return
-				this._change('showDrawer', 'visibleSync', false)
-			},
-			open() {
-				// fixed by mehaotian 处理重复点击打开的事件
-				if(this.visibleSync) return
-				this._change('visibleSync', 'showDrawer', true)
-			},
-			_change(param1, param2, status) {
-				this[param1] = status
-				if (this.watchTimer) {
-					clearTimeout(this.watchTimer)
-				}
-				this.watchTimer = setTimeout(() => {
-					this[param2] = status
-					this.$emit('change',status)
-				}, status ? 50 : 300)
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	// 抽屉宽度
-	$drawer-width: 220px;
-
-	.uni-drawer {
-		/* #ifndef APP-NVUE */
-		display: block;
-		/* #endif */
-		position: fixed;
-		top: 0;
-		left: 0;
-		right: 0;
-		bottom: 0;
-		overflow: hidden;
-		z-index: 999;
-	}
-
-	.uni-drawer__content {
-		/* #ifndef APP-NVUE */
-		display: block;
-		/* #endif */
-		position: absolute;
-		top: 0;
-		width: $drawer-width;
-		bottom: 0;
-		background-color: $uni-bg-color;
-		transition: transform 0.3s ease;
-	}
-
-	.uni-drawer--left {
-		left: 0;
-		/* #ifdef APP-NVUE */
-		transform: translateX(-$drawer-width);
-		/* #endif */
-		/* #ifndef APP-NVUE */
-		transform: translateX(-100%);
-		/* #endif */
-	}
-
-	.uni-drawer--right {
-		right: 0;
-		/* #ifdef APP-NVUE */
-		transform: translateX($drawer-width);
-		/* #endif */
-		/* #ifndef APP-NVUE */
-		transform: translateX(100%);
-		/* #endif */
-	}
-
-	.uni-drawer__content--visible {
-		transform: translateX(0px);
-	}
-
-
-	.uni-drawer__mask {
-		/* #ifndef APP-NVUE */
-		display: block;
-		/* #endif */
-		opacity: 0;
-		position: absolute;
-		top: 0;
-		left: 0;
-		bottom: 0;
-		right: 0;
-		background-color: $uni-bg-color-mask;
-		transition: opacity 0.3s;
-	}
-
-	.uni-drawer__mask--visible {
-		/* #ifndef APP-NVUE */
-		display: block;
-		/* #endif */
-		opacity: 1;
-	}
-</style>

components/uni-list-item/uni-list-item.vue

@@ -1,269 +0,0 @@
-<template>
-	<!-- #ifdef APP-NVUE -->
-	<cell>
-		<!-- #endif -->
-		<view :class="disabled ? 'uni-list-item--disabled' : ''" :hover-class="disabled || showSwitch ? '' : 'uni-list-item--hover'" class="uni-list-item" @click="onClick">
-			<view class="uni-list-item__container" :class="{ 'uni-list-item--first': isFirstChild }">
-				<view v-if="thumb" class="uni-list-item__icon"><image :src="thumb" class="uni-list-item__icon-img" /></view>
-				<view v-else-if="showExtraIcon" class="uni-list-item__icon">
-					<uni-icons :color="extraIcon.color" :size="extraIcon.size" :type="extraIcon.type" class="uni-icon-wrapper" />
-				</view>
-				<view class="uni-list-item__content">
-					<slot name="left"></slot>
-					<text class="uni-list-item__content-title">{{ title }}</text>
-					<text v-if="note" class="uni-list-item__content-note">{{ note }}</text>
-				</view>
-				<view class="uni-list-item__extra">
-					<text v-if="rightText" class="uni-list-item__extra-text">{{ rightText }}</text>
-					<uni-badge v-if="showBadge" :type="badgeType" :text="badgeText" />
-					<switch v-if="showSwitch" :disabled="disabled" :checked="switchChecked" @change="onSwitchChange" />
-					<slot name="right"></slot>
-					<uni-icons v-if="showArrow" :size="20" class="uni-icon-wrapper" color="#bbb" type="arrowright" />
-				</view>
-			</view>
-		</view>
-		<!-- #ifdef APP-NVUE -->
-	</cell>
-	<!-- #endif -->
-</template>
-
-<script>
-import uniIcons from '../uni-icons/uni-icons.vue';
-import uniBadge from '../uni-badge/uni-badge.vue';
-
-/**
- * ListItem 列表子组件
- * @description 列表子组件
- * @tutorial https://ext.dcloud.net.cn/plugin?id=24
- * @property {String} title 标题
- * @property {String} note 描述
- * @property {String} thumb 左侧缩略图，若thumb有值，则不会显示扩展图标
- * @property {String} badgeText 数字角标内容
- * @property {String} badgeType 数字角标类型，参考[uni-icons](https://ext.dcloud.net.cn/plugin?id=21)
- * @property {String} rightText 右侧文字内容
- * @property {Boolean} disabled = [true|false]是否禁用
- * @property {Boolean} showArrow = [true|false] 是否显示箭头图标
- * @property {Boolean} showBadge = [true|false] 是否显示数字角标
- * @property {Boolean} showSwitch = [true|false] 是否显示Switch
- * @property {Boolean} switchChecked = [true|false] Switch是否被选中
- * @property {Boolean} showExtraIcon = [true|false] 左侧是否显示扩展图标
- * @property {Boolean} scrollY = [true|false] 允许纵向滚动，需要显式的设置其宽高
- * @property {Object} extraIcon 扩展图标参数，格式为 {color: '#4cd964',size: '22',type: 'spinner'}
- * @event {Function} click 点击 uniListItem 触发事件
- * @event {Function} switchChange 点击切换 Switch 时触发
- */
-export default {
-	name: 'UniListItem',
-	components: {
-		uniIcons,
-		uniBadge
-	},
-	props: {
-		title: {
-			type: String,
-			default: ''
-		}, // 列表标题
-		note: {
-			type: String,
-			default: ''
-		}, // 列表描述
-		disabled: {
-			// 是否禁用
-			type: [Boolean, String],
-			default: false
-		},
-		showArrow: {
-			// 是否显示箭头
-			type: [Boolean, String],
-			default: true
-		},
-		showBadge: {
-			// 是否显示数字角标
-			type: [Boolean, String],
-			default: false
-		},
-		showSwitch: {
-			// 是否显示Switch
-			type: [Boolean, String],
-			default: false
-		},
-		switchChecked: {
-			// Switch是否被选中
-			type: [Boolean, String],
-			default: false
-		},
-		badgeText: {
-			// badge内容
-			type: String,
-			default: ''
-		},
-		badgeType: {
-			// badge类型
-			type: String,
-			default: 'success'
-		},
-		rightText: {
-			// 右侧文字内容
-			type: String,
-			default: ''
-		},
-		thumb: {
-			// 缩略图
-			type: String,
-			default: ''
-		},
-		showExtraIcon: {
-			// 是否显示扩展图标
-			type: [Boolean, String],
-			default: false
-		},
-		extraIcon: {
-			type: Object,
-			default() {
-				return {
-					type: 'contact',
-					color: '#000000',
-					size: 20
-				};
-			}
-		}
-	},
-	inject: ['list'],
-	data() {
-		return {
-			isFirstChild: false
-		};
-	},
-	mounted() {
-		if (!this.list.firstChildAppend) {
-			this.list.firstChildAppend = true;
-			this.isFirstChild = true;
-		}
-	},
-	methods: {
-		onClick() {
-			this.$emit('click');
-		},
-		onSwitchChange(e) {
-			this.$emit('switchChange', e.detail);
-		}
-	}
-};
-</script>
-
-<style lang="scss" scoped>
-$list-item-pd: $uni-spacing-col-lg $uni-spacing-row-lg;
-
-.uni-list-item {
-	font-size: $uni-font-size-lg;
-	position: relative;
-	flex-direction: column;
-	justify-content: space-between;
-}
-
-.uni-list-item--disabled {
-	opacity: 0.3;
-}
-
-.uni-list-item--hover {
-	background-color: $uni-bg-color-hover;
-}
-
-.uni-list-item__container {
-	line-height: 48rpx;
-	position: relative;
-	/* #ifndef APP-NVUE */
-	display: flex;
-	/* #endif */
-	flex-direction: row;
-	padding: $list-item-pd;
-	padding-left: 0;
-	flex: 1;
-	position: relative;
-	justify-content: space-between;
-	align-items: center;
-	/* #ifdef APP-PLUS */
-	border-top-color: $uni-border-color;
-	border-top-style: solid;
-	border-top-width: 0.5px;
-	/* #endif */
-}
-
-.uni-list-item--first {
-	border-top-width: 0px;
-}
-
-/* #ifndef APP-NVUE */
-.uni-list-item__container:after {
-	position: absolute;
-	top: 0;
-	right: 0;
-	left: 0;
-	height: 1px;
-	content: '';
-	-webkit-transform: scaleY(0.5);
-	transform: scaleY(0.5);
-	background-color: $uni-border-color;
-}
-
-.uni-list-item--first:after {
-	height: 0px;
-}
-
-/* #endif */
-
-.uni-list-item__content {
-	/* #ifndef APP-NVUE */
-	display: flex;
-	/* #endif */
-	flex: 1;
-	overflow: hidden;
-	flex-direction: column;
-	color: #3b4144;
-}
-
-.uni-list-item__content-title {
-	font-size: $uni-font-size-base;
-	color: #3b4144;
-	overflow: hidden;
-}
-
-.uni-list-item__content-note {
-	margin-top: 6rpx;
-	color: $uni-text-color-grey;
-	font-size: $uni-font-size-sm;
-	overflow: hidden;
-}
-
-.uni-list-item__extra {
-	// width: 25%;
-	/* #ifndef APP-NVUE */
-	display: flex;
-	/* #endif */
-	flex-direction: row;
-	justify-content: flex-end;
-	align-items: center;
-}
-
-.uni-list-item__icon {
-	display: flex;
-	margin-right: 18rpx;
-	flex-direction: row;
-	justify-content: center;
-	align-items: center;
-	
-	margin-left: 20rpx;
-}
-
-.uni-list-item__icon-img {
-	// height: $uni-img-size-base;
-	// width: $uni-img-size-base;
-	height: 38rpx;
-	width: 38rpx;
-}
-
-.uni-list-item__extra-text {
-	color: $uni-text-color-grey;
-	font-size: $uni-font-size-sm;
-}
-</style>

components/uni-list/uni-list.vue

@@ -1,75 +0,0 @@
-<template>
-	<!-- #ifndef APP-NVUE -->
-	<view class="uni-list">
-		<slot />
-	</view>
-	<!-- #endif -->
-	<!-- #ifdef APP-NVUE -->
-	<list class="uni-list" :enableBackToTop="enableBackToTop" loadmoreoffset="15" :scroll-y="scrollY" @loadmore="loadMore">
-		<slot />
-	</list>
-	<!-- #endif -->
-</template>
-
-<script>
-	/**
-	 * List 列表
-	 * @description 列表组件
-	 * @tutorial https://ext.dcloud.net.cn/plugin?id=24
-	 */
-	export default {
-		name: 'UniList',
-		'mp-weixin': {
-			options: {
-				multipleSlots: false
-			}
-		},
-		props: {
-			enableBackToTop: {
-				type: [Boolean, String],
-				default: false
-			},
-			scrollY: {
-				type: [Boolean, String],
-				default: false
-			}
-		},
-		provide() {
-			return {
-				list: this
-			}
-		},
-		created() {
-			this.firstChildAppend = false
-		},
-		methods: {
-			loadMore(e) {
-				this.$emit("scrolltolower");
-			}
-		}
-	}
-</script>
-<style lang="scss" scoped>
-	.uni-list {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		background-color: $uni-bg-color;
-		position: relative;
-		flex-direction: column;
-		// border-bottom-color: $uni-border-color;
-		// border-bottom-style: solid;
-		// border-bottom-width: 1px;
-	}
-
-	/* #ifndef APP-NVUE */
-	.uni-list:before {
-		height: 0;
-	}
-
-	.uni-list:after {
-		height: 0;
-	}
-
-	/* #endif */
-</style>

components/uni-list/uni-refresh.vue

@@ -1,65 +0,0 @@
-<template>
-    <!-- #ifdef APP-NVUE -->
-    <refresh :display="display" @refresh="onrefresh" @pullingdown="onpullingdown">
-        <slot />
-    </refresh>
-    <!-- #endif -->
-    <!-- #ifndef APP-NVUE -->
-    <view ref="uni-refresh" class="uni-refresh" v-show="isShow">
-        <slot />
-    </view>
-    <!-- #endif -->
-</template>
-
-<script>
-    export default {
-        name: 'UniRefresh',
-        props: {
-            display: {
-                type: [String],
-                default: "hide"
-            }
-        },
-        data() {
-            return {
-                pulling: false
-            }
-        },
-        computed: {
-            isShow() {
-                if (this.display === "show" || this.pulling === true) {
-                    return true;
-                }
-                return false;
-            }
-        },
-        created() {},
-        methods: {
-            onchange(value) {
-                this.pulling = value;
-            },
-            onrefresh(e) {
-                this.$emit("refresh", e);
-            },
-            onpullingdown(e) {
-                // #ifdef APP-NVUE
-                this.$emit("pullingdown", e);
-                // #endif
-                // #ifndef APP-NVUE
-                var detail = {
-                    viewHeight: 90,
-                    pullingDistance: e.height
-                }
-                this.$emit("pullingdown", detail);
-                // #endif
-            }
-        }
-    }
-</script>
-
-<style>
-    .uni-refresh {
-        height: 0;
-        overflow: hidden;
-    }
-</style>

components/uni-list/uni-refresh.wxs

@@ -1,87 +0,0 @@
-var pullDown = {
-    threshold: 95,
-    maxHeight: 200,
-    callRefresh: 'onrefresh',
-    callPullingDown: 'onpullingdown',
-    refreshSelector: '.uni-refresh'
-};
-
-function ready(newValue, oldValue, ownerInstance, instance) {
-    var state = instance.getState()
-    state.canPullDown = newValue;
-    // console.log(newValue);
-}
-
-function touchStart(e, instance) {
-    var state = instance.getState();
-    state.refreshInstance = instance.selectComponent(pullDown.refreshSelector);
-    state.canPullDown = (state.refreshInstance != null && state.refreshInstance != undefined);
-    if (!state.canPullDown) {
-        return
-    }
-
-    // console.log("touchStart");
-
-    state.height = 0;
-    state.touchStartY = e.touches[0].pageY || e.changedTouches[0].pageY;
-    state.refreshInstance.setStyle({
-        'height': 0
-    });
-    state.refreshInstance.callMethod("onchange", true);
-}
-
-function touchMove(e, ownerInstance) {
-    var instance = e.instance;
-    var state = instance.getState();
-    if (!state.canPullDown) {
-        return
-    }
-
-    var oldHeight = state.height;
-    var endY = e.touches[0].pageY || e.changedTouches[0].pageY;
-    var height = endY - state.touchStartY;
-    if (height > pullDown.maxHeight) {
-        return;
-    }
-
-    var refreshInstance = state.refreshInstance;
-    refreshInstance.setStyle({
-        'height': height + 'px'
-    });
-
-    height = height < pullDown.maxHeight ? height : pullDown.maxHeight;
-    state.height = height;
-    refreshInstance.callMethod(pullDown.callPullingDown, {
-        height: height
-    });
-}
-
-function touchEnd(e, ownerInstance) {
-    var state = e.instance.getState();
-    if (!state.canPullDown) {
-        return
-    }
-
-    state.refreshInstance.callMethod("onchange", false);
-
-    var refreshInstance = state.refreshInstance;
-    if (state.height > pullDown.threshold) {
-        refreshInstance.callMethod(pullDown.callRefresh);
-        return;
-    }
-
-    refreshInstance.setStyle({
-        'height': 0
-    });
-}
-
-function propObserver(newValue, oldValue, instance) {
-    pullDown = newValue;
-}
-
-module.exports = {
-    touchmove: touchMove,
-    touchstart: touchStart,
-    touchend: touchEnd,
-    propObserver: propObserver
-}

components/uni-notice-bar/uni-notice-bar.vue

@@ -1,395 +0,0 @@
-<template>
-	<view v-if="show" class="uni-noticebar" :style="{ backgroundColor: backgroundColor }" @click="onClick">
-		<!-- #ifdef MP-ALIPAY -->
-		<view v-if="showClose === true || showClose === 'true'" class="uni-noticebar-close" @click="close">
-			<uni-icons type="closeempty" :color="color" size="12" />
-		</view>
-		<view v-if="showIcon === true || showIcon === 'true'" class="uni-noticebar-icon">
-			<uni-icons type="sound" :color="color" size="14" />
-		</view>
-		<!-- #endif -->
-		<!-- #ifndef MP-ALIPAY -->
-		<uni-icons v-if="showClose === true || showClose === 'true'" class="uni-noticebar-close" type="closeempty" :color="color"
-		 size="12" @click="close" />
-		<uni-icons v-if="showIcon === true || showIcon === 'true'" class="uni-noticebar-icon" type="sound" :color="color"
-		 size="14" />
-		<!-- #endif -->
-		<view ref="textBox" class="uni-noticebar__content-wrapper" :class="{'uni-noticebar__content-wrapper--scrollable':scrollable, 'uni-noticebar__content-wrapper--single':!scrollable && (single || moreText)}">
-			<view :id="elIdBox" class="uni-noticebar__content" :class="{'uni-noticebar__content--scrollable':scrollable, 'uni-noticebar__content--single':!scrollable && (single || moreText)}">
-				<text :id="elId" ref="animationEle" class="uni-noticebar__content-text" :class="{'uni-noticebar__content-text--scrollable':scrollable,'uni-noticebar__content-text--single':!scrollable && (single || moreText)}"
-				 :style="{color:color, width:wrapWidth+'px', 'animationDuration': animationDuration, '-webkit-animationDuration': animationDuration ,animationPlayState: webviewHide?'paused':animationPlayState,'-webkit-animationPlayState':webviewHide?'paused':animationPlayState, animationDelay: animationDelay, '-webkit-animationDelay':animationDelay}">{{text}}</text>
-			</view>
-		</view>
-		<view v-if="showGetMore === true || showGetMore === 'true'" class="uni-noticebar__more" @click="clickMore">
-			<text v-if="moreText" :style="{ color: moreColor }" class="uni-noticebar__more-text">{{ moreText }}</text>
-			<uni-icons type="arrowright" :color="moreColor" size="14" />
-		</view>
-	</view>
-</template>
-
-<script>
-	import uniIcons from '../uni-icons/uni-icons.vue'
-	// #ifdef APP-NVUE
-	const dom = weex.requireModule('dom');
-	const animation = weex.requireModule('animation');
-	// #endif
-
-	/**
-	 * NoticeBar 自定义导航栏
-	 * @description 通告栏组件
-	 * @tutorial https://ext.dcloud.net.cn/plugin?id=30
-	 * @property {Number} speed 文字滚动的速度，默认100px/秒
-	 * @property {String} text 显示文字
-	 * @property {String} backgroundColor 背景颜色
-	 * @property {String} color 文字颜色
-	 * @property {String} moreColor 查看更多文字的颜色
-	 * @property {String} moreText 设置“查看更多”的文本
-	 * @property {Boolean} single = [true|false] 是否单行
-	 * @property {Boolean} scrollable = [true|false] 是否滚动，为true时，NoticeBar为单行
-	 * @property {Boolean} showIcon = [true|false] 是否显示左侧喇叭图标
-	 * @property {Boolean} showClose = [true|false] 是否显示左侧关闭按钮
-	 * @property {Boolean} showGetMore = [true|false] 是否显示右侧查看更多图标，为true时，NoticeBar为单行
-	 * @event {Function} click 点击 NoticeBar 触发事件
-	 * @event {Function} close 关闭 NoticeBar 触发事件
-	 * @event {Function} getmore 点击”查看更多“时触发事件
-	 */
-
-	export default {
-		name: 'UniNoticeBar',
-		components: {
-			uniIcons
-		},
-		props: {
-			text: {
-				type: String,
-				default: ''
-			},
-			moreText: {
-				type: String,
-				default: ''
-			},
-			backgroundColor: {
-				type: String,
-				default: '#fffbe8'
-			},
-			speed: {
-				// 默认1s滚动100px
-				type: Number,
-				default: 100
-			},
-			color: {
-				type: String,
-				default: '#de8c17'
-			},
-			moreColor: {
-				type: String,
-				default: '#999999'
-			},
-			single: {
-				// 是否单行
-				type: [Boolean, String],
-				default: false
-			},
-			scrollable: {
-				// 是否滚动，添加后控制单行效果取消
-				type: [Boolean, String],
-				default: false
-			},
-			showIcon: {
-				// 是否显示左侧icon
-				type: [Boolean, String],
-				default: false
-			},
-			showGetMore: {
-				// 是否显示右侧查看更多
-				type: [Boolean, String],
-				default: false
-			},
-			showClose: {
-				// 是否显示左侧关闭按钮
-				type: [Boolean, String],
-				default: false
-			}
-		},
-		data() {
-			const elId = `Uni_${Math.ceil(Math.random() * 10e5).toString(36)}`
-			const elIdBox = `Uni_${Math.ceil(Math.random() * 10e5).toString(36)}`
-			return {
-				textWidth: 0,
-				boxWidth: 0,
-				wrapWidth: '',
-				webviewHide: false,
-				// #ifdef APP-NVUE
-				stopAnimation: false,
-				// #endif
-				elId: elId,
-				elIdBox: elIdBox,
-				show: true,
-				animationDuration: 'none',
-				animationPlayState: 'paused',
-				animationDelay: '0s'
-			}
-		},
-		mounted() {
-			// #ifdef APP-PLUS
-			var pages = getCurrentPages();
-			var page = pages[pages.length - 1];
-			var currentWebview = page.$getAppWebview();
-			currentWebview.addEventListener('hide',()=>{
-				this.webviewHide = true
-			})
-			currentWebview.addEventListener('show',()=>{
-				this.webviewHide = false
-			})
-			// #endif
-			this.$nextTick(() => {
-				this.initSize()
-			})
-		},
-		// #ifdef APP-NVUE
-		beforeDestroy() {
-			this.stopAnimation = true
-		},
-		// #endif
-		methods: {
-			initSize() {
-				if (this.scrollable) {
-					// #ifndef APP-NVUE
-					let query = [],
-						boxWidth = 0,
-						textWidth = 0;
-					let textQuery = new Promise((resolve, reject) => {
-						uni.createSelectorQuery()
-							// #ifndef MP-ALIPAY
-							.in(this)
-							// #endif
-							.select(`#${this.elId}`)
-							.boundingClientRect()
-							.exec(ret => {
-								this.textWidth = ret[0].width
-								resolve()
-							})
-					})
-					let boxQuery = new Promise((resolve, reject) => {
-						uni.createSelectorQuery()
-							// #ifndef MP-ALIPAY
-							.in(this)
-							// #endif
-							.select(`#${this.elIdBox}`)
-							.boundingClientRect()
-							.exec(ret => {
-								this.boxWidth = ret[0].width
-								resolve()
-							})
-					})
-					query.push(textQuery)
-					query.push(boxQuery)
-					Promise.all(query).then(() => {
-						this.animationDuration = `${this.textWidth / this.speed}s`
-						this.animationDelay = `-${this.boxWidth / this.speed}s`
-						setTimeout(() => {
-							this.animationPlayState = 'running'
-						}, 1000)
-					})
-					// #endif
-					// #ifdef APP-NVUE
-					dom.getComponentRect(this.$refs['animationEle'], (res) => {
-						let winWidth = uni.getSystemInfoSync().windowWidth
-						this.textWidth = res.size.width
-						animation.transition(this.$refs['animationEle'], {
-							styles: {
-								transform: `translateY(-${winWidth}px)`
-							},
-							duration: 0,
-							timingFunction: 'linear',
-							delay: 0
-						}, () => {
-							if (!this.stopAnimation) {
-								animation.transition(this.$refs['animationEle'], {
-									styles: {
-										transform: `translateY(-${this.textWidth}px)`
-									},
-									timingFunction: 'linear',
-									duration: (this.textWidth - winWidth) / this.speed * 1000,
-									delay: 1000
-								}, () => {
-									if (!this.stopAnimation) {
-										this.loopAnimation()
-									}
-								});
-							}
-						});
-					})
-					// #endif
-				}
-				// #ifdef APP-NVUE
-				if (!this.scrollable && (this.single || this.moreText)) {
-					dom.getComponentRect(this.$refs['textBox'], (res) => {
-						this.wrapWidth = res.size.width
-					})
-				}
-				// #endif
-			},
-			loopAnimation() {
-				// #ifdef APP-NVUE
-				animation.transition(this.$refs['animationEle'], {
-					styles: {
-						transform: `translateY(0px)`
-					},
-					duration: 0
-				}, () => {
-					if (!this.stopAnimation) {
-						animation.transition(this.$refs['animationEle'], {
-							styles: {
-								transform: `translateY(-${this.textWidth}px)`
-							},
-							duration: this.textWidth / this.speed * 1000,
-							timingFunction: 'linear',
-							delay: 0
-						}, () => {
-							if (!this.stopAnimation) {
-								this.loopAnimation()
-							}
-						});
-					}
-				});
-				// #endif
-			},
-			clickMore() {
-				this.$emit('getmore')
-			},
-			close() {
-				this.show = false;
-				this.$emit('close')
-			},
-			onClick() {
-				this.$emit('click')
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-
-	.uni-noticebar {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		width: 100%;
-		box-sizing: border-box;
-		/* #endif */
-		flex-direction: row;
-		align-items: center;
-		padding: 6px 12px;
-		margin-bottom: 10px;
-	}
-
-	.uni-noticebar-close {
-		margin-right: 5px;
-	}
-
-	.uni-noticebar-icon {
-		margin-right: 5px;
-	}
-
-	.uni-noticebar__content-wrapper {
-		flex: 1;
-		flex-direction: column;
-		overflow: hidden;
-	}
-
-	.uni-noticebar__content-wrapper--single {
-		/* #ifndef APP-NVUE */
-		line-height: 18px;
-		/* #endif */
-	}
-
-	.uni-noticebar__content-wrapper--single,
-	.uni-noticebar__content-wrapper--scrollable {
-		flex-direction: row;
-	}
-
-	/* #ifndef APP-NVUE */
-	.uni-noticebar__content-wrapper--scrollable {
-		position: relative;
-		height: 18px;
-	}
-	/* #endif */
-
-	.uni-noticebar__content--scrollable {
-		/* #ifdef APP-NVUE */
-		flex: 0;
-		/* #endif */
-		/* #ifndef APP-NVUE */
-		flex: 1;
-		display: block;
-		overflow: hidden;
-		/* #endif */
-	}
-
-	.uni-noticebar__content--single {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		flex: none;
-		width: 100%;
-		justify-content: center;
-		/* #endif */
-	}
-
-	.uni-noticebar__content-text {
-		font-size: 14px;
-		line-height: 18px;
-		/* #ifndef APP-NVUE */
-		word-break: break-all;
-		/* #endif */
-	}
-
-	.uni-noticebar__content-text--single {
-		/* #ifdef APP-NVUE */
-		lines: 1;
-		/* #endif */
-		/* #ifndef APP-NVUE */
-		display: block;
-		width: 100%;
-		white-space: nowrap;
-		/* #endif */
-		overflow: hidden;
-		text-overflow: ellipsis;
-	}
-
-	.uni-noticebar__content-text--scrollable {
-		/* #ifdef APP-NVUE */
-		lines: 1;
-		padding-left: 750rpx;
-		/* #endif */
-		/* #ifndef APP-NVUE */
-		position: absolute;
-		display: block;
-		height: 18px;
-		line-height: 18px;
-		white-space: nowrap;
-		padding-left: 100%;
-		animation: notice 10s 0s linear infinite both;
-		animation-play-state: paused;
-		/* #endif */
-	}
-
-	.uni-noticebar__more {
-		/* #ifndef APP-NVUE */
-		display: inline-flex;
-		/* #endif */
-		flex-direction: row;
-		flex-wrap: nowrap;
-		align-items: center;
-		padding-left: 5px;
-	}
-
-	.uni-noticebar__more-text {
-		font-size: 14px;
-	}
-
-	@keyframes notice {
-		100% {
-			transform: translate3d(-100%, 0, 0);
-		}
-	}
-</style>

components/uni-popup/message.js

@@ -1,29 +0,0 @@
-export default {
-	created() {
-		if (this.type === 'message') {
-			// 获取自组件对象
-			this.maskShow = false
-			this.children = null
-		}
-	},
-	created() {
-		if (this.type === 'message') {
-			// 不显示遮罩
-			this.maskShow = false 
-			// 获取子组件对象
-			this.childrenMsg = null
-		}
-	},
-	methods: {
-		customOpen() {
-			if (this.childrenMsg) {
-				this.childrenMsg.open()
-			}
-		},
-		customClose() {
-			if (this.childrenMsg) {
-				this.childrenMsg.close()
-			}
-		}
-	}
-}

components/uni-popup/popup.js

@@ -1,24 +0,0 @@
-import message from './message.js';
-// 定义 type 类型:弹出类型：top/bottom/center
-const config = {
-	// 顶部弹出
-	top:'top',
-	// 底部弹出
-	bottom:'bottom',
-	// 居中弹出
-	center:'center',
-	// 消息提示
-	message:'top',
-	// 对话框
-	dialog:'center',
-	// 分享
-	share:'bottom',
-}
-export default {
-	data(){
-		return {
-			config:config
-		}
-	},
-	mixins: [message],
-}

components/uni-popup/uni-popup-dialog.vue

@@ -1,243 +0,0 @@
-<template>
-	<view class="uni-popup-dialog">
-		<view class="uni-dialog-title">
-			<text class="uni-dialog-title-text" :class="['uni-popup__'+dialogType]">{{title}}</text>
-		</view>
-		<view class="uni-dialog-content">
-			<text class="uni-dialog-content-text" v-if="mode === 'base'">{{content}}</text>
-			<input v-else class="uni-dialog-input" v-model="val" type="text" :placeholder="placeholder" :focus="focus" >
-		</view>
-		<view class="uni-dialog-button-group">
-			<view class="uni-dialog-button" @click="close">
-				<text class="uni-dialog-button-text">取消</text>
-			</view>
-			<view class="uni-dialog-button uni-border-left" @click="onOk">
-				<text class="uni-dialog-button-text uni-button-color">确定</text>
-			</view>
-		</view>
-
-	</view>
-</template>
-
-<script>
-	/**
-	 * PopUp 弹出层-对话框样式
-	 * @description 弹出层-对话框样式
-	 * @tutorial https://ext.dcloud.net.cn/plugin?id=329
-	 * @property {String} value input 模式下的默认值
-	 * @property {String} placeholder input 模式下输入提示
-	 * @property {String} type = [success|warning|info|error] 主题样式
-	 *  @value success 成功
-	 * 	@value warning 提示
-	 * 	@value info 消息
-	 * 	@value error 错误
-	 * @property {String} mode = [base|input] 模式、
-	 * 	@value base 基础对话框
-	 * 	@value input 可输入对话框
-	 * @property {String} content 对话框内容
-	 * @property {Boolean} beforeClose 是否拦截取消事件
-	 * @event {Function} confirm 点击确认按钮触发
-	 * @event {Function} close 点击取消按钮触发
-	 */
-
-	export default {
-		name: "uniPopupDialog",
-		props: {
-			value: {
-				type: [String, Number],
-				default: ''
-			},
-			placeholder: {
-				type: [String, Number],
-				default: '请输入内容'
-			},
-			/**
-			 * 对话框主题 success/warning/info/error	  默认 success
-			 */
-			type: {
-				type: String,
-				default: 'error'
-			},
-			/**
-			 * 对话框模式 base/input
-			 */
-			mode: {
-				type: String,
-				default: 'base'
-			},
-			/**
-			 * 对话框标题
-			 */
-			title: {
-				type: String,
-				default: '提示'
-			},
-			/**
-			 * 对话框内容
-			 */
-			content: {
-				type: String,
-				default: ''
-			},
-			/**
-			 * 拦截取消事件 ，如果拦截取消事件，必须监听close事件，执行 done()
-			 */
-			beforeClose: {
-				type: Boolean,
-				default: false
-			}
-		},
-		data() {
-			return {
-				dialogType: 'error',
-				focus: false,
-				val: ""
-			}
-		},
-		inject: ['popup'],
-		watch: {
-			type(val) {
-				this.dialogType = val
-			},
-			mode(val) {
-				if (val === 'input') {
-					this.dialogType = 'info'
-				}
-			},
-			value(val) {
-				this.val = val
-			}
-		},
-		created() {
-			// 对话框遮罩不可点击
-			this.popup.mkclick = false
-			if (this.mode === 'input') {
-				this.dialogType = 'info'
-				this.val = this.value
-			} else {
-				this.dialogType = this.type
-			}
-		},
-		mounted() {
-			this.focus = true
-		},
-		methods: {
-			/**
-			 * 点击确认按钮
-			 */
-			onOk() {
-				this.$emit('confirm', () => {
-					this.popup.close()
-					if (this.mode === 'input') this.val = this.value
-				}, this.mode === 'input' ? this.val : '')
-			},
-			/**
-			 * 点击取消按钮
-			 */
-			close() {
-				if (this.beforeClose) {
-					this.$emit('close', () => {
-						this.popup.close()
-					})
-					return
-				}
-				this.popup.close()
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.uni-popup-dialog {
-		width: 300px;
-		border-radius: 15px;
-		background-color: #fff;
-	}
-
-	.uni-dialog-title {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex-direction: row;
-		justify-content: center;
-		padding-top: 15px;
-		padding-bottom: 5px;
-	}
-
-	.uni-dialog-title-text {
-		font-size: 16px;
-		font-weight: 500;
-	}
-
-	.uni-dialog-content {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex-direction: row;
-		justify-content: center;
-		align-items: center;
-		padding: 5px 15px 15px 15px;
-	}
-
-	.uni-dialog-content-text {
-		font-size: 14px;
-		color: #6e6e6e;
-	}
-
-	.uni-dialog-button-group {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex-direction: row;
-		border-top-color: #f5f5f5;
-		border-top-style: solid;
-		border-top-width: 1px;
-	}
-
-	.uni-dialog-button {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-
-		flex: 1;
-		flex-direction: row;
-		justify-content: center;
-		align-items: center;
-		height: 45px;
-	}
-
-	.uni-border-left {
-		border-left-color: #f0f0f0;
-		border-left-style: solid;
-		border-left-width: 1px;
-	}
-
-	.uni-dialog-button-text {
-		font-size: 14px;
-	}
-
-	.uni-button-color {
-		color: $uni-color-primary;
-	}
-
-	.uni-dialog-input {
-		flex: 1;
-		font-size: 14px;
-	}
-
-	.uni-popup__success {
-		color: $uni-color-success;
-	}
-
-	.uni-popup__warn {
-		color: $uni-color-warning;
-	}
-
-	.uni-popup__error {
-		color: $uni-color-error;
-	}
-
-	.uni-popup__info {
-		color: #909399;
-	}
-</style>

components/uni-popup/uni-popup-message.vue

@@ -1,116 +0,0 @@
-<template>
-	<view class="uni-popup-message" :class="'uni-popup__'+[type]">
-		<text class="uni-popup-message-text" :class="'uni-popup__'+[type]+'-text'">{{message}}</text>
-	</view>
-</template>
-
-<script>
-	
-	/**
-	 * PopUp 弹出层-消息提示
-	 * @description 弹出层-消息提示
-	 * @tutorial https://ext.dcloud.net.cn/plugin?id=329
-	 * @property {String} type = [success|warning|info|error] 主题样式
-	 *  @value success 成功
-	 * 	@value warning 提示
-	 * 	@value info 消息
-	 * 	@value error 错误
-	 * @property {String} message 消息提示文字
-	 * @property {String} duration 显示时间，设置为 0 则不会自动关闭
-	 */
-	
-	export default {
-		name: 'UniPopupMessage',
-		props: {
-			/**
-			 * 主题 success/warning/info/error	  默认 success
-			 */
-			type: {
-				type: String,
-				default: 'success'
-			},
-			/**
-			 * 消息文字
-			 */
-			message: {
-				type: String,
-				default: ''
-			},
-			/**
-			 * 显示时间，设置为 0 则不会自动关闭
-			 */
-			duration: {
-				type: Number,
-				default: 3000
-			}
-		},
-		inject: ['popup'],
-		data() {
-			return {}
-		},
-		created() {
-			this.popup.childrenMsg = this
-		},
-		methods: {
-			open() {
-				if (this.duration === 0) return
-				clearTimeout(this.popuptimer)
-				this.popuptimer = setTimeout(() => {
-					this.popup.close()
-				}, this.duration)
-			},
-			close() {
-				clearTimeout(this.popuptimer)
-			}
-		}
-	}
-</script>
-<style lang="scss" scoped>
-	.uni-popup-message {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex-direction: row;
-		background-color: #e1f3d8;
-		padding: 10px 15px;
-		border-color: #eee;
-		border-style: solid;
-		border-width: 1px;
-	}
-	.uni-popup-message-text {
-		font-size: 14px;
-		padding: 0;
-	}
-
-	.uni-popup__success {
-		background-color: #e1f3d8;
-	}
-
-	.uni-popup__success-text {
-		color: #67C23A;
-	}
-
-	.uni-popup__warn {
-		background-color: #faecd8;
-	}
-
-	.uni-popup__warn-text {
-		color: #E6A23C;
-	}
-
-	.uni-popup__error {
-		background-color: #fde2e2;
-	}
-
-	.uni-popup__error-text {
-		color: #F56C6C;
-	}
-
-	.uni-popup__info {
-		background-color: #F2F6FC;
-	}
-
-	.uni-popup__info-text {
-		color: #909399;
-	}
-</style>

components/uni-popup/uni-popup-share.vue

@@ -1,165 +0,0 @@
-<template>
-	<view class="uni-popup-share">
-		<view class="uni-share-title"><text class="uni-share-title-text">{{title}}</text></view>
-		<view class="uni-share-content">
-			<view class="uni-share-content-box">
-				<view class="uni-share-content-item" v-for="(item,index) in bottomData" :key="index" @click.stop="select(item,index)">
-					<image class="uni-share-image" :src="item.icon" mode="aspectFill"></image>
-					<text class="uni-share-text">{{item.text}}</text>
-				</view>
-
-			</view>
-		</view>
-		<view class="uni-share-button-box">
-			<button class="uni-share-button" @click="close">取消</button>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		name: 'UniPopupShare',
-		props: {
-			title: {
-				type: String,
-				default: '分享到'
-			}
-		},
-		inject: ['popup'],
-		data() {
-			return {
-				bottomData: [{
-						text: '微信',
-						icon: 'https://img-cdn-qiniu.dcloud.net.cn/uni-ui/grid-2.png',
-						name: 'wx'
-					},
-					{
-						text: '支付宝',
-						icon: 'https://img-cdn-qiniu.dcloud.net.cn/uni-ui/grid-8.png',
-						name: 'wx'
-					},
-					{
-						text: 'QQ',
-						icon: 'https://img-cdn-qiniu.dcloud.net.cn/uni-ui/gird-3.png',
-						name: 'qq'
-					},
-					{
-						text: '新浪',
-						icon: 'https://img-cdn-qiniu.dcloud.net.cn/uni-ui/grid-1.png',
-						name: 'sina'
-					},
-					{
-						text: '百度',
-						icon: 'https://img-cdn-qiniu.dcloud.net.cn/uni-ui/grid-7.png',
-						name: 'copy'
-					},
-					{
-						text: '其他',
-						icon: 'https://img-cdn-qiniu.dcloud.net.cn/uni-ui/grid-5.png',
-						name: 'more'
-					}
-				]
-			}
-		},
-		created() {},
-		methods: {
-			/**
-			 * 选择内容
-			 */
-			select(item, index) {
-				this.$emit('select', {
-					item,
-					index
-				}, () => {
-					this.popup.close()
-				})
-			},
-			/**
-			 * 关闭窗口
-			 */
-			close() {
-				this.popup.close()
-			}
-		}
-	}
-</script>
-<style lang="scss" scoped>
-	.uni-popup-share {
-		background-color: #fff;
-	}
-	.uni-share-title {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex-direction: row;
-		align-items: center;
-		justify-content: center;
-		height: 40px;
-	}
-	.uni-share-title-text {
-		font-size: 14px;
-		color: #666;
-	}
-	.uni-share-content {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex-direction: row;
-		justify-content: center;
-		padding-top: 10px;
-	}
-	
-	.uni-share-content-box {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex-direction: row;
-		flex-wrap: wrap;
-		width: 360px;
-	}
-	
-	.uni-share-content-item {
-		width: 90px;
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex-direction: column;
-		justify-content: center;
-		padding: 10px 0;
-		align-items: center;
-	}
-	
-	.uni-share-content-item:active {
-		background-color: #f5f5f5;
-	}
-	
-	.uni-share-image {
-		width: 30px;
-		height: 30px;
-	}
-	
-	.uni-share-text {
-		margin-top: 10px;
-		font-size: 14px;
-		color: #3B4144;
-	}
-	
-	.uni-share-button-box {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex-direction: row;
-		padding: 10px 15px;
-	}
-	
-	.uni-share-button {
-		flex: 1;
-		border-radius: 50px;
-		color: #666;
-		font-size: 16px;
-	}
-	
-	.uni-share-button::after {
-		border-radius: 50px;
-	}
-</style>

components/uni-popup/uni-popup.vue

@@ -1,294 +0,0 @@
-<template>
-	<view v-if="showPopup" class="uni-popup" :class="[popupstyle]" @touchmove.stop.prevent="clear">
-		<uni-transition v-if="maskShow" :mode-class="['fade']" :styles="maskClass" :duration="duration" :show="showTrans"
-		 @click="onTap" />
-		<uni-transition :mode-class="ani" :styles="transClass" :duration="duration" :show="showTrans" @click="onTap">
-			<view class="uni-popup__wrapper-box" @click.stop="clear">
-				<slot />
-			</view>
-		</uni-transition>
-	</view>
-</template>
-
-<script>
-	import uniTransition from '../uni-transition/uni-transition.vue'
-	import popup from './popup.js'
-	/**
-	 * PopUp 弹出层
-	 * @description 弹出层组件，为了解决遮罩弹层的问题
-	 * @tutorial https://ext.dcloud.net.cn/plugin?id=329
-	 * @property {String} type = [top|center|bottom] 弹出方式
-	 * 	@value top 顶部弹出
-	 * 	@value center 中间弹出
-	 * 	@value bottom 底部弹出
-	 * 	@value message 消息提示
-	 * 	@value dialog 对话框
-	 * 	@value share 底部分享示例
-	 * @property {Boolean} animation = [ture|false] 是否开启动画
-	 * @property {Boolean} maskClick = [ture|false] 蒙版点击是否关闭弹窗
-	 * @event {Function} change 打开关闭弹窗触发，e={show: false}
-	 */
-
-	export default {
-		name: 'UniPopup',
-		components: {
-			uniTransition
-		},
-		props: {
-			// 开启动画
-			animation: {
-				type: Boolean,
-				default: true
-			},
-			// 弹出层类型，可选值，top: 顶部弹出层；bottom：底部弹出层；center：全屏弹出层
-			// message: 消息提示 ; dialog : 对话框
-			type: {
-				type: String,
-				default: 'center'
-			},
-			// maskClick
-			maskClick: {
-				type: Boolean,
-				default: true
-			}
-		},
-		provide() {
-			return {
-				popup: this
-			}
-		},
-		mixins: [popup],
-		watch: {
-			/**
-			 * 监听type类型
-			 */
-			type: {
-				handler: function(newVal) {
-					this[this.config[newVal]]()
-				},
-				immediate: true
-			},
-			/**
-			 * 监听遮罩是否可点击
-			 * @param {Object} val
-			 */
-			maskClick(val) {
-				this.mkclick = val
-			}
-		},
-		data() {
-			return {
-				duration: 300,
-				ani: [],
-				showPopup: false,
-				showTrans: false,
-				maskClass: {
-					'position': 'fixed',
-					'bottom': 0,
-					'top': 0,
-					'left': 0,
-					'right': 0,
-					'backgroundColor': 'rgba(0, 0, 0, 0.4)'
-				},
-				transClass: {
-					'position': 'fixed',
-					'left': 0,
-					'right': 0,
-				},
-				maskShow: true,
-				mkclick: true,
-				popupstyle: 'top'
-			}
-		},
-		created() {
-			this.mkclick = this.maskClick
-			if (this.animation) {
-				this.duration = 300
-			} else {
-				this.duration = 0
-			}
-		},
-		methods: {
-			clear(e) {
-				// TODO nvue 取消冒泡
-				e.stopPropagation()
-			},
-			open() {
-				this.showPopup = true
-				this.$nextTick(() => {
-					new Promise(resolve => {
-						clearTimeout(this.timer)
-						this.timer = setTimeout(() => {
-							this.showTrans = true
-							// fixed by mehaotian 兼容 app 端
-							this.$nextTick(() => {
-								resolve();
-							})
-						}, 50);
-					}).then(res => {
-						// 自定义打开事件
-						clearTimeout(this.msgtimer)
-						this.msgtimer = setTimeout(() => {
-							this.customOpen && this.customOpen()
-						}, 100)
-						this.$emit('change', {
-							show: true,
-							type: this.type
-						})
-					})
-				})
-			},
-			close(type) {
-				this.showTrans = false
-				this.$nextTick(() => {
-					this.$emit('change', {
-						show: false,
-						type: this.type
-					})
-					clearTimeout(this.timer)
-					// 自定义关闭事件
-					this.customOpen && this.customClose()
-					this.timer = setTimeout(() => {
-						this.showPopup = false
-					}, 300)
-				})
-			},
-			onTap() {
-				if (!this.mkclick) return
-				this.close()
-			},
-			/**
-			 * 顶部弹出样式处理
-			 */
-			top() {
-				this.popupstyle = 'top'
-				this.ani = ['slide-top']
-				this.transClass = {
-					'position': 'fixed',
-					'left': 0,
-					'right': 0,
-				}
-			},
-			/**
-			 * 底部弹出样式处理
-			 */
-			bottom() {
-				this.popupstyle = 'bottom'
-				this.ani = ['slide-bottom']
-				this.transClass = {
-					'position': 'fixed',
-					'left': 0,
-					'right': 0,
-					'bottom': 0
-				}
-			},
-			/**
-			 * 中间弹出样式处理
-			 */
-			center() {
-				this.popupstyle = 'center'
-				this.ani = ['zoom-out', 'fade']
-				this.transClass = {
-					'position': 'fixed',
-					/* #ifndef APP-NVUE */
-					'display': 'flex',
-					'flexDirection': 'column',
-					/* #endif */
-					'bottom': 0,
-					'left': 0,
-					'right': 0,
-					'top': 0,
-					'justifyContent': 'center',
-					'alignItems': 'center'
-				}
-			}
-		}
-	}
-</script>
-<style lang="scss" scoped>
-	.uni-popup {
-		position: fixed;
-		/* #ifndef APP-NVUE */
-		z-index: 99;
-		/* #endif */
-	}
-
-	.uni-popup__mask {
-		position: absolute;
-		top: 0;
-		bottom: 0;
-		left: 0;
-		right: 0;
-		background-color: $uni-bg-color-mask;
-		opacity: 0;
-	}
-
-	.mask-ani {
-		transition-property: opacity;
-		transition-duration: 0.2s;
-	}
-
-	.uni-top-mask {
-		opacity: 1;
-	}
-
-	.uni-bottom-mask {
-		opacity: 1;
-	}
-
-	.uni-center-mask {
-		opacity: 1;
-	}
-
-	.uni-popup__wrapper {
-		/* #ifndef APP-NVUE */
-		display: block;
-		/* #endif */
-		position: absolute;
-	}
-
-	.top {
-		/* #ifdef H5 */
-		top: var(--window-top);
-		/* #endif */
-		/* #ifndef H5 */
-		top: 0;
-		/* #endif */
-	}
-
-	.bottom {
-		bottom: 0;
-	}
-
-	.uni-popup__wrapper-box {
-		/* #ifndef APP-NVUE */
-		display: block;
-		/* #endif */
-		position: relative;
-		/* iphonex 等安全区设置，底部安全区适配 */
-		/* #ifndef APP-NVUE */
-		padding-bottom: constant(safe-area-inset-bottom);
-		padding-bottom: env(safe-area-inset-bottom);
-		/* #endif */
-	}
-
-	.content-ani {
-		// transition: transform 0.3s;
-		transition-property: transform, opacity;
-		transition-duration: 0.2s;
-	}
-
-
-	.uni-top-content {
-		transform: translateY(0);
-	}
-
-	.uni-bottom-content {
-		transform: translateY(0);
-	}
-
-	.uni-center-content {
-		transform: scale(1);
-		opacity: 1;
-	}
-</style>

components/uni-section/uni-section.vue

@@ -1,135 +0,0 @@
-<template>
-	<view class="uni-section" nvue>
-		<view v-if="type" class="uni-section__head">
-			<view :class="type" class="uni-section__head-tag" />
-		</view>
-		<view class="uni-section__content">
-			<text :class="{'distraction':!subTitle}" class="uni-section__content-title">{{ title }}</text>
-			<text v-if="subTitle" class="uni-section__content-sub">{{ subTitle }}</text>
-		</view>
-		<slot />
-	</view>
-</template>
-
-<script>
-
-	/**
-	 * Section 标题栏
-	 * @description 标题栏
-	 * @property {String} type = [line|circle] 标题装饰类型
-	 * 	@value line 竖线
-	 * 	@value circle 圆形
-	 * @property {String} title 主标题
-	 * @property {String} subTitle 副标题
-	 */
-
-	export default {
-		name: 'UniTitle',
-		props: {
-			type: {
-				type: String,
-				default: ''
-			},
-			title: {
-				type: String,
-				default: ''
-			},
-			subTitle: {
-				type: String,
-				default: ''
-			}
-		},
-		data() {
-			return {}
-		},
-		watch: {
-			title(newVal) {
-				if (uni.report && newVal !== '') {
-					uni.report('title', newVal)
-				}
-			}
-		},
-		methods: {
-			onClick() {
-				this.$emit('click')
-			}
-		}
-	}
-</script>
-<style lang="scss" scoped>
-	.uni-section {
-		position: relative;
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		margin-top: 10px;
-		flex-direction: row;
-		align-items: center;
-		padding: 0 10px;
-		height: 50px;
-		background-color: $uni-bg-color-grey;
-		/* #ifdef APP-NVUE */
-		border-bottom-color: $uni-border-color;
-		border-bottom-style: solid;
-		border-bottom-width: 0.5px;
-		/* #endif */
-		font-weight: normal;
-	}
-	/* #ifndef APP-NVUE */
-	.uni-section:after {
-		position: absolute;
-		bottom: 0;
-		right: 0;
-		left: 0;
-		height: 1px;
-		content: '';
-		-webkit-transform: scaleY(.5);
-		transform: scaleY(.5);
-		background-color: $uni-border-color;
-	}
-	/* #endif */
-
-	.uni-section__head {
-		flex-direction: row;
-		justify-content: center;
-		align-items: center;
-		margin-right: 10px;
-	}
-
-	.line {
-		height: 15px;
-		background-color: $uni-text-color-disable;
-		border-radius: 5px;
-		width: 3px;
-	}
-
-	.circle {
-		width: 8px;
-		height: 8px;
-		border-top-right-radius: 50px;
-		border-top-left-radius: 50px;
-		border-bottom-left-radius: 50px;
-		border-bottom-right-radius: 50px;
-		background-color: $uni-text-color-disable;
-	}
-
-	.uni-section__content {
-		flex: 1;
-		color: $uni-text-color;
-	}
-
-	.uni-section__content-title {
-		font-size: $uni-font-size-base;
-		color: $uni-text-color;
-	}
-
-	.distraction {
-		flex-direction: row;
-		align-items: center;
-	}
-
-	.uni-section__content-sub {
-		font-size: $uni-font-size-sm;
-		color: $uni-text-color-grey;
-	}
-</style>

components/uni-steps/uni-steps.vue

@@ -1,253 +0,0 @@
-<template>
-	<view class="uni-steps">
-		<view :class="[direction==='column'?'uni-steps__column':'uni-steps__row']">
-			<view :class="[direction==='column'?'uni-steps__column-text-container':'uni-steps__row-text-container']">
-				<view v-for="(item,index) in options" :key="index" :class="[direction==='column'?'uni-steps__column-text':'uni-steps__row-text']">
-					<text :style="{color:index<=active?activeColor:deactiveColor}" :class="[direction==='column'?'uni-steps__column-title':'uni-steps__row-title']">{{item.title}}</text>
-					<text v-if="direction=='column'" :style="{color:index<=active?activeColor:deactiveColor}" :class="[direction==='column'?'uni-steps__column-desc':'uni-steps__row-desc']">{{item.desc}}</text>
-				</view>
-			</view>
-			<view :class="[direction==='column'?'uni-steps__column-container':'uni-steps__row-container']">
-				<view :class="[direction==='column'?'uni-steps__column-line-item':'uni-steps__row-line-item']" v-for="(item,index) in options"
-				 :key="index">
-					<view :class="[direction==='column'?'uni-steps__column-line':'uni-steps__row-line',direction==='column'?'uni-steps__column-line--before':'uni-steps__row-line--before']"
-					 :style="{backgroundColor:index<=active&&index!==0?activeColor:index===0?'transparent':deactiveColor}"></view>
-					<view :class="[direction==='column'?'uni-steps__column-check':'uni-steps__row-check']" v-if="index === active">
-						<uni-icons :color="activeColor" type="checkbox-filled" size="14"></uni-icons>
-					</view>
-					<view :class="[direction==='column'?'uni-steps__column-circle':'uni-steps__row-circle']" v-else :style="{backgroundColor:index<active?activeColor:deactiveColor}"></view>
-					<view :class="[direction==='column'?'uni-steps__column-line':'uni-steps__row-line',direction==='column'?'uni-steps__column-line--after':'uni-steps__row-line--after']"
-					 :style="{backgroundColor:index<active&&index!==options.length-1?activeColor:index===options.length-1?'transparent':deactiveColor}"></view>
-					<!-- <view v-if="index==0 && direction!='column'" class="address">北京市</view>
-					<view v-if="options.length-1 == index && direction!='column'" class="address">太原市</view> -->
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import uniIcons from '../uni-icons/uni-icons.vue'
-	export default {
-		name: 'UniSteps',
-		components: {
-			uniIcons
-		},
-		props: {
-			direction: {
-				// 排列方向 row column
-				type: String,
-				default: 'row'
-			},
-			activeColor: {
-				// 激活状态颜色
-				type: String,
-				default: '#1aad19'
-			},
-			deactiveColor: {
-				// 未激活状态颜色
-				type: String,
-				default: '#999999'
-			},
-			active: {
-				// 当前步骤
-				type: Number,
-				default: 0
-			},
-			options: {
-				type: Array,
-				default () {
-					return []
-				}
-			} // 数据
-		},
-		data() {
-			return {}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.uni-steps {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		width: 100%;
-		/* #endif */
-		/* #ifdef APP-NVUE */
-		flex: 1;
-		/* #endif */
-		flex-direction: column;
-	}
-
-	.uni-steps__row {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex-direction: column;
-	}
-
-	.uni-steps__column {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex-direction: row-reverse;
-	}
-
-	.uni-steps__row-text-container {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex-direction: row;
-	}
-
-	.uni-steps__column-text-container {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex-direction: column;
-		flex: 1;
-	}
-
-	.uni-steps__row-text {
-		/* #ifndef APP-NVUE */
-		display: inline-flex;
-		/* #endif */
-		flex: 1;
-		flex-direction: column;
-	}
-
-	.uni-steps__column-text {
-		padding: 6px 0px;
-		// border-bottom-style: solid;
-		// border-bottom-width: 1px;
-		// border-bottom-color: $uni-border-color;
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex-direction: column;
-	}
-
-	.uni-steps__row-title {
-		font-size: 24rpx;
-		line-height: 16px;
-		text-align: center;
-	}
-
-	.uni-steps__column-title {
-		font-size: 24rpx;
-		text-align: left;
-		line-height: 18px;
-	}
-
-	.uni-steps__row-desc {
-		font-size: 12px;
-		line-height: 14px;
-		text-align: center;
-	}
-
-	.uni-steps__column-desc {
-		font-size: $uni-font-size-sm;
-		text-align: left;
-		line-height: 18px;
-	}
-
-	.uni-steps__row-container {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex-direction: row;
-	}
-
-	.uni-steps__column-container {
-		/* #ifndef APP-NVUE */
-		display: inline-flex;
-		/* #endif */
-		width: 30px;
-		flex-direction: column;
-	}
-
-	.uni-steps__row-line-item {
-		/* #ifndef APP-NVUE */
-		display: inline-flex;
-		/* #endif */
-		flex-direction: row;
-		flex: 1;
-		height: 14px;
-		line-height: 14px;
-		align-items: center;
-		justify-content: center;
-		position: relative;
-		.address{
-			position: absolute;
-			top: 40rpx;
-			left: 60rpx;
-			color: #999;
-			font-size: 24rpx;
-		}
-	}
-
-	.uni-steps__column-line-item {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex-direction: column;
-		flex: 1;
-		align-items: center;
-		justify-content: center;
-	}
-
-	.uni-steps__row-line {
-		flex: 1;
-		height: 1px;
-		background-color: $uni-text-color-grey;
-	}
-
-	.uni-steps__column-line {
-		width: 1px;
-		background-color: $uni-text-color-grey;
-	}
-
-	.uni-steps__row-line--after {
-		transform: translateX(1px);
-	}
-
-	.uni-steps__column-line--after {
-		flex: 1;
-		transform: translate(0px, 1px);
-	}
-
-	.uni-steps__row-line--before {
-		transform: translateX(-1px);
-	}
-
-	.uni-steps__column-line--before {
-		height: 6px;
-		transform: translate(0px, -1px);
-	}
-
-	.uni-steps__row-circle {
-		width: 5px;
-		height: 5px;
-		border-radius: 100px;
-		background-color: $uni-text-color-grey;
-		margin: 0px 3px;
-	}
-
-	.uni-steps__column-circle {
-		width: 5px;
-		height: 5px;
-		border-radius: 100px;
-		background-color: $uni-text-color-grey;
-		margin: 4px 0px 5px 0px;
-	}
-
-	.uni-steps__row-check {
-		margin: 0px 6px;
-	}
-
-	.uni-steps__column-check {
-		height: 14px;
-		line-height: 14px;
-		margin: 2px 0px;
-	}
-</style>

components/uni-swiper-dot/uni-swiper-dot.vue

@@ -1,184 +0,0 @@
-<template>
-	<view class="uni-swiper__warp">
-		<slot />
-		<view v-if="mode === 'default'" :style="{'bottom':dots.bottom + 'px'}" class="uni-swiper__dots-box" key='default'>
-			<view v-for="(item,index) in info" :style="{
-        'width': (index === current? dots.width*2:dots.width ) + 'px','height':dots.width/3 +'px' ,'background-color':index !== current?dots.backgroundColor:dots.selectedBackgroundColor,'border-radius':'0px'}"
-			 :key="index" class="uni-swiper__dots-item uni-swiper__dots-bar" />
-		</view>
-		<view v-if="mode === 'dot'" :style="{'bottom':dots.bottom + 'px'}" class="uni-swiper__dots-box" key='dot'>
-			<view v-for="(item,index) in info" :style="{
-        'width': dots.width + 'px','height':dots.height +'px' ,'background-color':index !== current?dots.backgroundColor:dots.selectedBackgroundColor,'border':index !==current ? dots.border:dots.selectedBorder}"
-			 :key="index" class="uni-swiper__dots-item" />
-		</view>
-		<view v-if="mode === 'round'" :style="{'bottom':dots.bottom + 'px'}" class="uni-swiper__dots-box" key='round'>
-			<view v-for="(item,index) in info" :class="[index === current&&'uni-swiper__dots-long']" :style="{
-		    'width':(index === current? dots.width*3:dots.width ) + 'px','height':dots.height +'px' ,'background-color':index !== current?dots.backgroundColor:dots.selectedBackgroundColor,'border':index !==current ? dots.border:dots.selectedBorder}"
-			 :key="index" class="uni-swiper__dots-item " />
-		</view>
-		<view v-if="mode === 'nav'" key='nav' :style="{'background-color':dotsStyles.backgroundColor,'bottom':'0'}" class="uni-swiper__dots-box uni-swiper__dots-nav">
-			<text :style="{'color':dotsStyles.color}" class="uni-swiper__dots-nav-item">{{ (current+1)+"/"+info.length +' ' +info[current][field] }}</text>
-		</view>
-		<view v-if="mode === 'indexes'" key='indexes' :style="{'bottom':dots.bottom + 'px'}" class="uni-swiper__dots-box">
-			<view v-for="(item,index) in info" :style="{
-        'width':dots.width + 'px','height':dots.height +'px' ,'color':index === current?dots.selectedColor:dots.color,'background-color':index !== current?dots.backgroundColor:dots.selectedBackgroundColor,'border':index !==current ? dots.border:dots.selectedBorder}"
-			 :key="index" class="uni-swiper__dots-item uni-swiper__dots-indexes"><text class="uni-swiper__dots-indexes-text">{{ index+1 }}</text></view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		name: 'UniSwiperDot',
-		props: {
-			info: {
-				type: Array,
-				default () {
-					return []
-				}
-			},
-			current: {
-				type: Number,
-				default: 0
-			},
-			dotsStyles: {
-				type: Object,
-				default () {
-					return {}
-				}
-			},
-			// 类型 ：default(默认) indexes long nav
-			mode: {
-				type: String,
-				default: 'default'
-			},
-			// 只在 nav 模式下生效，变量名称
-			field: {
-				type: String,
-				default: ''
-			}
-		},
-		data() {
-			return {
-				dots: {
-					width: 8,
-					height: 8,
-					bottom: 10,
-					color: '#fff',
-					backgroundColor: 'rgba(0, 0, 0, .3)',
-					border: '1px rgba(0, 0, 0, .3) solid',
-					selectedBackgroundColor: '#333',
-					selectedBorder: '1px rgba(0, 0, 0, .9) solid'
-				}
-			}
-		},
-		watch: {
-			dotsStyles(newVal) {
-				this.dots = Object.assign(this.dots, this.dotsStyles)
-			},
-			mode(newVal) {
-				if (newVal === 'indexes') {
-					this.dots.width = 20
-					this.dots.height = 20
-				} else {
-					this.dots.width = 8
-					this.dots.height = 8
-				}
-			}
-
-		},
-		created() {
-			if (this.mode === 'indexes') {
-				this.dots.width = 20
-				this.dots.height = 20
-			}
-			this.dots = Object.assign(this.dots, this.dotsStyles)
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.uni-swiper__warp {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex: 1;
-		flex-direction: column;
-		position: relative;
-		overflow: hidden;
-	}
-
-	.uni-swiper__dots-box {
-		position: absolute;
-		bottom: 10px;
-		left: 0;
-		right: 0;
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex: 1;
-		flex-direction: row;
-		justify-content: center;
-		align-items: center;
-	}
-
-	.uni-swiper__dots-item {
-		width: 8px;
-		border-radius: 100px;
-		margin-left: 6px;
-		background-color: $uni-bg-color-mask;
-		// transition: width 0.2s linear;  不要取消注释，不然会不能变色
-	}
-	
-	.uni-swiper__dots-item:first-child {
-		margin: 0;
-	}
-
-	.uni-swiper__dots-default {
-		border-radius: 100px;
-	}
-
-	.uni-swiper__dots-long {
-		border-radius: 50px;
-	}
-
-	.uni-swiper__dots-bar {
-		border-radius: 50px;
-	}
-
-	.uni-swiper__dots-nav {
-		bottom: 0px;
-		height: 40px;
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex: 1;
-		flex-direction: row;
-		justify-content: flex-start;
-		align-items: center;
-		background-color: rgba(0, 0, 0, 0.2);
-	}
-
-	.uni-swiper__dots-nav-item {
-		/* overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap; */
-		font-size: $uni-font-size-base;
-		color: #fff;
-		margin: 0 15px;
-	}
-
-	.uni-swiper__dots-indexes {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		// flex: 1;
-		justify-content: center;
-		align-items: center;
-	}
-
-	.uni-swiper__dots-indexes-text {
-		color: #fff;
-		font-size: $uni-font-size-sm;
-	}
-</style>

components/uni-tag/uni-tag.vue

@@ -1,230 +0,0 @@
-<template>
-	<view :class="[
-      'uni-tag--' + type,
-      disabled === true || disabled === 'true' ? 'uni-tag--disabled' : '',
-      inverted === true || inverted === 'true' ? type + '-uni-tag--inverted' : '',
-      circle === true || circle === 'true' ? 'uni-tag--circle' : '',
-      mark === true || mark === 'true' ? 'uni-tag--mark' : '',
-      'uni-tag--' + size
-    ]"
-	 @click="onClick()" class="uni-tag" v-if="text">
-		<text :class="[type === 'default' ? 'uni-tag--default':'uni-tag-text',inverted === true || inverted === 'true' ? 'uni-tag-text--'+type : '',size === 'small' ? 'uni-tag-text--small':'' ]">{{ text }}</text>
-	</view>
-</template>
-
-<script>
-	/**
-	 * Tag 标签
-	 * @description 用于展示1个或多个文字标签，可点击切换选中、不选中的状态
-	 * @tutorial https://ext.dcloud.net.cn/plugin?id=35
-	 * @property {String} text 标签内容
-	 * @property {String} size = [normal|small] 大小尺寸
-	 * 	@value normal 正常
-	 * 	@value small 小尺寸
-	 * @property {String} type = [default|primary|success｜warning｜error｜royal]  颜色类型
-	 * 	@value default 灰色
-	 * 	@value primary 蓝色
-	 * 	@value success 绿色
-	 * 	@value warning 黄色
-	 * 	@value error 红色
-	 * 	@value royal 紫色
-	 * @property {Boolean} disabled = [true|false] 是否为禁用状态
-	 * @property {Boolean} inverted = [true|false] 是否无需背景颜色（空心标签）
-	 * @property {Boolean} circle = [true|false] 是否为圆角
-	 * @event {Function} click 点击 Tag 触发事件
-	 */
-
-	export default {
-		name: "UniTag",
-		props: {
-			type: {
-				// 标签类型default、primary、success、warning、error、royal
-				type: String,
-				default: "default"
-			},
-			size: {
-				// 标签大小 normal, small
-				type: String,
-				default: "normal"
-			},
-			// 标签内容
-			text: {
-				type: String,
-				default: ""
-			},
-			disabled: {
-				// 是否为禁用状态
-				type: [Boolean, String],
-				default: false
-			},
-			inverted: {
-				// 是否为空心
-				type: [Boolean, String],
-				default: false
-			},
-			circle: {
-				// 是否为圆角样式
-				type: [Boolean, String],
-				default: false
-			},
-			mark: {
-				// 是否为标记样式
-				type: [Boolean, String],
-				default: false
-			}
-		},
-		methods: {
-			onClick() {
-				if (this.disabled === true || this.disabled === "true") {
-					return;
-				}
-				this.$emit("click");
-			}
-		}
-	};
-</script>
-
-<style lang="scss" scoped>
-	$tag-pd: 0px 16px;
-	$tag-small-pd: 0px 8px;
-
-	.uni-tag {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		padding: $tag-pd;
-		height: 30px;
-		line-height: 30px;
-		justify-content: center;
-		color: $uni-text-color;
-		border-radius: $uni-border-radius-base;
-		background-color: $uni-bg-color-grey;
-		border-width: 1rpx;
-		border-style: solid;
-		border-color: $uni-bg-color-grey;
-	}
-
-	.uni-tag--circle {
-		border-radius: 15px;
-	}
-
-	.uni-tag--mark {
-		border-top-left-radius: 0;
-		border-bottom-left-radius: 0;
-		border-top-right-radius: 15px;
-		border-bottom-right-radius: 15px;
-	}
-
-	.uni-tag--disabled {
-		opacity: 0.5;
-	}
-
-	.uni-tag--small {
-		height: 20px;
-		padding: $tag-small-pd;
-		line-height: 20px;
-		font-size: $uni-font-size-sm;
-	}
-
-	.uni-tag--default {
-		color: $uni-text-color;
-		font-size: $uni-font-size-base;
-	}
-
-	.uni-tag-text--small {
-		font-size: $uni-font-size-sm !important;
-	}
-
-	.uni-tag-text {
-		color: $uni-text-color-inverse;
-		font-size: $uni-font-size-base;
-	}
-
-	.uni-tag-text--primary {
-		color: $uni-color-primary !important;
-	}
-
-	.uni-tag-text--success {
-		color: $uni-color-success !important;
-	}
-
-	.uni-tag-text--warning {
-		color: $uni-color-warning !important;
-	}
-
-	.uni-tag-text--error {
-		color: $uni-color-error !important;
-	}
-
-	.uni-tag--primary {
-		color: $uni-text-color-inverse;
-		background-color: $uni-color-primary;
-		border-width: 1rpx;
-		border-style: solid;
-		border-color: $uni-color-primary;
-	}
-
-	.primary-uni-tag--inverted {
-		color: $uni-color-primary;
-		background-color: $uni-bg-color;
-		border-width: 1rpx;
-		border-style: solid;
-		border-color: $uni-color-primary;
-	}
-
-	.uni-tag--success {
-		color: $uni-text-color-inverse;
-		background-color: $uni-color-success;
-		border-width: 1rpx;
-		border-style: solid;
-		border-color: $uni-color-success;
-	}
-
-	.success-uni-tag--inverted {
-		color: $uni-color-success;
-		background-color: $uni-bg-color;
-		border-width: 1rpx;
-		border-style: solid;
-		border-color: $uni-color-success;
-	}
-
-	.uni-tag--warning {
-		color: $uni-text-color-inverse;
-		background-color: $uni-color-warning;
-		border-width: 1rpx;
-		border-style: solid;
-		border-color: $uni-color-warning;
-	}
-
-	.warning-uni-tag--inverted {
-		color: $uni-color-warning;
-		background-color: $uni-bg-color;
-		border-width: 1rpx;
-		border-style: solid;
-		border-color: $uni-color-warning;
-	}
-
-	.uni-tag--error {
-		color: $uni-text-color-inverse;
-		background-color: $uni-color-error;
-		border-width: 1rpx;
-		border-style: solid;
-		border-color: $uni-color-error;
-	}
-
-	.error-uni-tag--inverted {
-		color: $uni-color-error;
-		background-color: $uni-bg-color;
-		border-width: 1rpx;
-		border-style: solid;
-		border-color: $uni-color-error;
-	}
-
-	.uni-tag--inverted {
-		color: $uni-text-color;
-		background-color: $uni-bg-color;
-		border-width: 1rpx;
-		border-style: solid;
-		border-color: $uni-bg-color-grey;
-	}
-</style>

components/uni-transition/uni-transition.vue

@@ -1,279 +0,0 @@
-<template>
-	<view v-if="isShow" ref="ani" class="uni-transition" :class="[ani.in]" :style="'transform:' +transform+';'+stylesObject"
-	 @click="change">
-		 <slot></slot>
-	</view>
-</template>
-
-<script>
-	// #ifdef APP-NVUE
-	const animation = uni.requireNativePlugin('animation');
-	// #endif
-	/**
-	 * Transition 过渡动画
-	 * @description 简单过渡动画组件
-	 * @tutorial https://ext.dcloud.net.cn/plugin?id=985
-	 * @property {Boolean} show = [false|true] 控制组件显示或隐藏
-     * @property {Array} modeClass = [fade|slide-top|slide-right|slide-bottom|slide-left|zoom-in|zoom-out] 过渡动画类型
-     *  @value fade 渐隐渐出过渡
-     *  @value slide-top 由上至下过渡
-     *  @value slide-right 由右至左过渡
-     *  @value slide-bottom 由下至上过渡
-     *  @value slide-left 由左至右过渡
-     *  @value zoom-in 由小到大过渡
-     *  @value zoom-out 由大到小过渡
-	 * @property {Number} duration 过渡动画持续时间
-	 * @property {Object} styles 组件样式，同 css 样式，注意带’-‘连接符的属性需要使用小驼峰写法如：`backgroundColor:red`
-	 */
-	export default {
-		name: 'uniTransition',
-		props: {
-			show: {
-				type: Boolean,
-				default: false
-			},
-			modeClass: {
-				type: Array,
-				default () {
-					return []
-				}
-			},
-			duration: {
-				type: Number,
-				default: 300
-			},
-			styles: {
-				type: Object,
-				default () {
-					return {}
-				}
-			}
-		},
-		data() {
-			return {
-				isShow: false,
-				transform: '',
-				ani: { in: '',
-					active: ''
-				}
-			};
-		},
-		watch: {
-			show: {
-				handler(newVal) {
-					if (newVal) {
-						this.open()
-					} else {
-						this.close()
-					}
-				},
-				immediate: true
-			}
-		},
-		computed: {
-			stylesObject() {
-				let styles = {
-					...this.styles,
-					'transition-duration': this.duration / 1000 + 's'
-				}
-				let transfrom = ''
-				for (let i in styles) {
-					let line = this.toLine(i)
-					transfrom += line + ':' + styles[i] + ';'
-				}
-				return transfrom
-			}
-		},
-		created() {
-			// this.timer = null
-			// this.nextTick = (time = 50) => new Promise(resolve => {
-			// 	clearTimeout(this.timer)
-			// 	this.timer = setTimeout(resolve, time)
-			// 	return this.timer
-			// });
-		},
-		methods: {
-			change() {
-				this.$emit('click', {
-					detail: this.isShow
-				})
-			},
-			open() {
-				clearTimeout(this.timer)
-				this.isShow = true
-				this.transform = ''
-				this.ani.in = ''
-				for (let i in this.getTranfrom(false)) {
-					if (i === 'opacity') {
-						this.ani.in = 'fade-in'
-					} else {
-						this.transform += `${this.getTranfrom(false)[i]} `
-					}
-				}
-				this.$nextTick(() => {
-					setTimeout(() => {
-						this._animation(true)
-					}, 50)
-				})
-
-			},
-			close(type) {
-				clearTimeout(this.timer)
-				this._animation(false)
-			},
-			_animation(type) {
-				let styles = this.getTranfrom(type)
-				// #ifdef APP-NVUE
-				if(!this.$refs['ani']) return
-				animation.transition(this.$refs['ani'].ref, {
-					styles,
-					duration: this.duration, //ms
-					timingFunction: 'ease',
-					needLayout: false,
-					delay: 0 //ms
-				}, () => {
-					if (!type) {
-						this.isShow = false
-					}
-					this.$emit('change', {
-						detail: this.isShow
-					})
-				})
-				// #endif
-				// #ifndef APP-NVUE
-				this.transform = ''
-				for (let i in styles) {
-					if (i === 'opacity') {
-						this.ani.in = `fade-${type?'out':'in'}`
-					} else {
-						this.transform += `${styles[i]} `
-					}
-				}
-				this.timer = setTimeout(() => {
-					if (!type) {
-						this.isShow = false
-					}
-					this.$emit('change', {
-						detail: this.isShow
-					})
-
-				}, this.duration)
-				// #endif
-
-			},
-			getTranfrom(type) {
-				let styles = {
-					transform: ''
-				}
-				this.modeClass.forEach((mode) => {
-					switch (mode) {
-						case 'fade':
-							styles.opacity = type ? 1 : 0
-							break;
-						case 'slide-top':
-							styles.transform += `translateY(${type?'0':'-100%'}) `
-							break;
-						case 'slide-right':
-							styles.transform += `translateX(${type?'0':'100%'}) `
-							break;
-						case 'slide-bottom':
-							styles.transform += `translateY(${type?'0':'100%'}) `
-							break;
-						case 'slide-left':
-							styles.transform += `translateX(${type?'0':'-100%'}) `
-							break;
-						case 'zoom-in':
-							styles.transform += `scale(${type?1:0.8}) `
-							break;
-						case 'zoom-out':
-							styles.transform += `scale(${type?1:1.2}) `
-							break;
-					}
-				})
-				return styles
-			},
-			_modeClassArr(type) {
-				let mode = this.modeClass
-				if (typeof(mode) !== "string") {
-					let modestr = ''
-					mode.forEach((item) => {
-						modestr += (item + '-' + type + ',')
-					})
-					return modestr.substr(0, modestr.length - 1)
-				} else {
-					return mode + '-' + type
-				}
-			},
-			// getEl(el) {
-			// 	console.log(el || el.ref || null);
-			// 	return el || el.ref || null
-			// },
-			toLine(name) {
-				return name.replace(/([A-Z])/g, "-$1").toLowerCase();
-			}
-		}
-	}
-</script>
-
-<style>
-	.uni-transition {
-		transition-timing-function: ease;
-		transition-duration: 0.3s;
-		transition-property: transform, opacity;
-	}
-
-	.fade-in {
-		opacity: 0;
-	}
-
-	.fade-active {
-		opacity: 1;
-	}
-
-	.slide-top-in {
-		/* transition-property: transform, opacity; */
-		transform: translateY(-100%);
-	}
-
-	.slide-top-active {
-		transform: translateY(0);
-		/* opacity: 1; */
-	}
-
-	.slide-right-in {
-		transform: translateX(100%);
-	}
-
-	.slide-right-active {
-		transform: translateX(0);
-	}
-
-	.slide-bottom-in {
-		transform: translateY(100%);
-	}
-
-	.slide-bottom-active {
-		transform: translateY(0);
-	}
-
-	.slide-left-in {
-		transform: translateX(-100%);
-	}
-
-	.slide-left-active {
-		transform: translateX(0);
-		opacity: 1;
-	}
-
-	.zoom-in-in {
-		transform: scale(0.8);
-	}
-
-	.zoom-out-active {
-		transform: scale(1);
-	}
-
-	.zoom-out-in {
-		transform: scale(1.2);
-	}
-</style>

components/verification/verification.vue

@@ -49,38 +49,14 @@
         </view>
       </view>
     </view>
-    <!-- <view
-      @click="hide"
-      v-show="flage"
-      class="flex-row-around"
-      style="border-radius: 10rpx; background-color: #ebebeb"
-      :style="{
-        width: width,
-        height: height,
-        'margin-left': left,
-        'margin-top': top,
-      }"
-      :class="vsr ? 'border-index' : ''"
-    >
-      <view class="flex-row-center" style="width: 45rpx; height: 45rpx">
-        <view v-show="!vsr" class="dh-wt"> </view>
-        <view
-          v-show="vsr"
-          class="cuIcon-roundcheck"
-          style="font-size: 45rpx; color: #07c160"
-        >
-        </view>
-      </view>
-      <text :class="vsr ? 'ttcl' : ''" style="color: #5a5a5a">{{ vsrtx }}</text>
-      <view class="cuIcon-safe text-gray"> </view>
-    </view> -->
+
   </view>
 </template>
 
 <script>
 import api from "@/config/api.js";
 import storage from "@/utils/storage.js";
-
+import uuid from "@/utils/uuid.modified.js";
 const phone = uni.getSystemInfoSync();
 const l = phone.screenWidth / 750;
 export default {
@@ -89,12 +65,6 @@ export default {
     // 可自行调整
     this.scHight = phone.screenHeight / 2 - 200 + "px";
     this.getCode();
-    // 监听是否要重新验证
-    uni.$on("vert", (data) => {
-      this.vsr = data;
-      this.vsrtx = "点击进行验证";
-      this.getCode();
-    });
   },
   props: {
     height: {
@@ -160,10 +130,19 @@ export default {
         this.hid = !this.hid;
       }
     },
+    error() {
+      this.vsr = false;
+      this.hid = false;
+      this.moveX = 0;
+      this.moveCode = 0;
+    },
     // 获取验证图片
     getCode() {
       this.col = "#b3afae";
       this.hasImg = "图片加载中...";
+      if (!storage.getUuid()) {
+        storage.setUuid(uuid.v1());
+      }
       uni.request({
         url: api.common + "/slider/" + this.business,
         header: {
@@ -209,13 +188,12 @@ export default {
         },
         success: (res) => {
           this.endLoad = true;
-
           res.data.result == false
             ? (res.data.result = false)
             : (res.data.result = true);
 
           if (res.data && res.data.result) {
-            // // 验证成功后把key发送出去,后端会把验证信息存在缓存里
+            //验证成功后把key发送出去,后端会把验证信息存在缓存里
             this.$emit("send", this.key);
             this.hide();
             this.vsr = true;
@@ -336,30 +314,6 @@ export default {
   width: 750rpx;
 }
 
-.border-bom {
-  border-bottom: 0.5rpx solid #dddddd;
-}
-
-.border-red {
-  border-bottom: 1rpx solid #d33e18;
-}
-
-.border-bom-big {
-  border-bottom: 8rpx solid #dddddd;
-}
-
-.border-bom-white {
-  border-bottom: 2rpx solid #ffffff;
-}
-
-.border-bom-green {
-  border-bottom: 4rpx solid #f8f9bd;
-}
-
-.border-bom-index {
-  border-bottom: 4rpx solid #27d9b3;
-}
-
 .padding-left {
   padding-left: 20rpx;
 }
@@ -389,33 +343,6 @@ export default {
   margin-top: -35rpx;
 }
 
-.lk-tag {
-  height: 50rpx;
-  padding: 0 10rpx;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  border: 2rpx solid #24bd9f;
-  border-radius: 6rpx;
-  color: #1c947a;
-  font-weight: 500;
-}
-
-.tb-tag-my {
-  border-radius: 15rpx;
-  font-size: 16rpx;
-  margin-left: 5rpx;
-}
-
-.my-green {
-  color: #29c7a5;
-}
-
-.my-hui {
-  color: #585858;
-  font-size: 22rpx;
-}
-
 .flex-column-center {
   display: flex;
   flex-direction: column;
@@ -524,76 +451,10 @@ export default {
   bottom: 70rpx;
 }
 
-.white-box {
-  padding: 0 20rpx;
-  margin-bottom: 15rpx;
-  margin-top: 5rpx;
-  width: 715rpx;
-  background-color: #ffffff;
-  border-radius: 30rpx;
-}
-
-.green-box {
-  padding: 0 20rpx;
-  margin-bottom: 15rpx;
-  margin-top: 5rpx;
-  width: 715rpx;
-  background-color: #ffffff;
-  border-radius: 30rpx;
-  background-image: linear-gradient(#1faf97, #29c7a5);
-}
-
-.yuan-sm {
-  width: 13rpx;
-  height: 13rpx;
-  border-radius: 50%;
-  background-color: #1fc189;
-  margin-left: 10rpx;
-}
-
-.yuan-normal {
-  width: 14rpx;
-  height: 14rpx;
-  border-radius: 50%;
-  background-color: #159f3c;
-  margin-left: 10rpx;
-}
-
-.yuan-normal-red {
-  width: 14rpx;
-  height: 14rpx;
-  border-radius: 50%;
-  background-color: #bc3c11;
-  margin-left: 10rpx;
-}
-
-.yuan-sm-red {
-  width: 13rpx;
-  height: 13rpx;
-  border-radius: 50%;
-  background-color: #de410d;
-  margin-left: 10rpx;
-}
-
-.white-box-all {
-  margin-top: 5rpx;
-  width: 750rpx;
-  background-color: #ffffff;
-  border-radius: 13px;
-}
-
 .moneycolor {
   color: #ea5002;
 }
 
-.text-bold-sm {
-  font-weight: 425;
-}
-
-.sm-moneycolor {
-  color: #e3793b;
-}
-
 .margin-top {
   margin-top: 20rpx;
 }
@@ -610,72 +471,10 @@ export default {
   margin-left: 20rpx;
 }
 
-.margin-left-top {
-  margin-left: 20rpx;
-  margin-top: 20rpx;
-}
-
 .margin-right {
   margin-right: 20rpx;
 }
 
-.my-absolute {
-  position: absolute;
-}
-
-.my-fixed {
-  position: fixed;
-}
-
-.my-seach {
-  width: 450rpx;
-  height: 55rpx;
-  background-color: #f8f8f8;
-  border-radius: 30rpx;
-  padding-left: 20rpx;
-}
-
-.move-view {
-  width: 48rpx;
-  height: 10rpx;
-  background-color: #28ba91;
-  border-radius: 4rpx;
-  margin-left: 100rpx;
-}
-
-.move-view-p {
-  width: 45rpx;
-  height: 10rpx;
-  background-color: #28ba91;
-  border-radius: 4rpx;
-}
-
-.header-dh {
-  position: fixed;
-  padding-top: 20rpx;
-  padding-bottom: 15rpx;
-  height: 70rpx;
-  width: 750rpx;
-  background-color: #f1f1f1;
-  z-index: 20;
-}
-
-.tp-normal {
-  width: 60rpx;
-  height: 60rpx;
-}
-
-.tp-sm {
-  width: 45rpx;
-  height: 45rpx;
-}
-
-.tp-big {
-  width: 70rpx;
-  height: 70rpx;
-  border-radius: 50%;
-}
-
 .main-color {
   color: #07d188;
 }

config/api.js

@@ -6,12 +6,12 @@
 const dev = {
   common: "https://common-api.pickmall.cn",
   buyer: "https://buyer-api.pickmall.cn",
+
 };
 // 生产环境
 const prod = {
   common: "https://common-api.pickmall.cn",
   buyer: "https://buyer-api.pickmall.cn",
- 
 };
 
 //默认生产环境
@@ -22,7 +22,7 @@ if (process.env.NODE_ENV == "development") {
 } else {
   api = prod;
 }
-//微信小程序，app的打包方式只能是生产环境，所以这块直接条件编译赋值
+//微信小程序，app的打包方式建议为生产环境，所以这块直接条件编译赋值
 // #ifdef MP-WEIXIN || APP-PLUS
 api = prod;
 // #endif

config/config.js

@@ -1,10 +1,16 @@
-const name = "lilishop";
+const name = "lilishop"; //全局商城name
+const schemeName = 'lilishop' //唤醒app需要的schemeName
 export default {
   name: name,
-  schemeLink: `${name}://`, //唤起app地址
-  downloadLink: "https://pickmall.cn/download-page/index.html", //下载地址
-  shareLink: "https://m-b2b2c.pickmall.cn", //分享地址
+  schemeLink: `${schemeName}://`, //唤起app地址
+  downloadLink: "https://pickmall.cn/download-page/index.html", //下载地址，下载app的地址
+  shareLink: "https://m-b2b2c.pickmall.cn", //分享地址，也就是在h5中默认的复制地址
   appid: "wx6f10f29075dc1b0b", //小程序唯一凭证，即 AppID，可在「微信公众平台 - 设置 - 开发设置」页中获得。（需要已经成为开发者，且帐号没有异常状态）
   appSecret: "6dfbe0c72380dce5d49d65b3c91059b1", //可在 manifest.json 查看
   aMapKey: "d649892b3937a5ad20b76dacb2bcb5bd", //在高德中申请web端key
+  scanAuthNavigation:['https://m-b2b2c.pickmall.cn/'], //扫码认证跳转域名配置 会根据此处配置的路由进行跳转
+  iosAppId:"id1564638363", //AppStore的应用地址id 具体在分享->拷贝链接中查看
+  logo:"https://lilishop-oss.oss-cn-beijing.aliyuncs.com/4c864e133c2944efad1f7282ac8a3b9e.png", //logo地址
+  customerServiceMobile:"13161366885", //客服电话
+  customerServiceEmail:"lili@lili.com" //客服邮箱 
 }; 

js_sdk/lili-pay/wx-pay.js

@@ -1,7 +1,18 @@
+/**
+ * 微信小程序支付
+ * 此处针对于微信小程序开发的支付插件
+ * 第一次支付成功后会跳出订阅的消息 如果用户拒绝或同意都会跳转到支付成功页面
+ * 如果点击订阅 会将状态写进缓存 之后不再提醒。
+ * 
+ * @param {sn,price}
+ */
+
 import { initiatePay } from "@/api/trade";
+import { getWeChatMpMessage } from "@/api/message.js";
 class LiLiWXPay {
   constructor(...payList) {
     this.data = payList[0];
+    console.log(payList);
     // 调用支付
     this.pay = () => {
       uni.showLoading({
@@ -32,13 +43,7 @@ class LiLiWXPay {
               icon: "none",
               title: "支付成功!",
             });
-            // 之后成功后跳转到支付成功页面
-            uni.redirectTo({
-              url:
-                "/pages/cart/payment/success?paymentMethod=WECHAT" +
-                "&payPrice=" +
-                this.data.price,
-            });
+            sendMessage(payList[0].price);
           },
           fail: (e) => {
             this.exception = e;
@@ -59,4 +64,53 @@ class LiLiWXPay {
   }
 }
 
+function sendMessage(price) {
+  //判断用户是否已经进行了订阅
+  if (!uni.getStorageSync("acceptSubscribeMessage")) {
+    //订阅消息
+    getWeChatMpMessage().then((res) => {
+      var message = res.data.result;
+      var templateid = message.map((item) => item.code);
+      uni.requestSubscribeMessage({
+        tmplIds: templateid,
+        success: (res) => {
+          for (let key in res) {
+            // 表示用户拒绝订阅该信息
+            if (res[key] == "reject") {
+              this.checked = false;
+            } else {
+              uni.setStorageSync("acceptSubscribeMessage", res);
+            }
+          }
+        },
+        fail: (res) => {
+          uni.removeStorageSync("acceptSubscribeMessage");
+          this.checked = false;
+        },
+        complete: () => {
+          /**
+           * 已经支付成功
+           */
+          uni.redirectTo({
+            url:
+              "/pages/cart/payment/success?paymentMethod=WECHAT" +
+              "&payPrice=" +
+              price,
+          });
+        },
+      });
+    });
+  } else {
+    /**
+     * 已经支付成功
+     */
+    uni.redirectTo({
+      url:
+        "/pages/cart/payment/success?paymentMethod=WECHAT" +
+        "&payPrice=" +
+        price,
+    });
+  }
+}
+
 export default LiLiWXPay;

lib/wa-permission/permission.js

@@ -1,274 +0,0 @@
-/**
- * 本模块封装了Android、iOS的应用权限判断、打开应用权限设置界面、以及位置系统服务是否开启
- */
-
-var isIos;
-// #ifdef APP-PLUS
-isIos = plus.os.name == "iOS";
-// #endif
-
-// 判断推送权限是否开启
-function judgeIosPermissionPush() {
-  var result = false;
-  var UIApplication = plus.ios.import("UIApplication");
-  var app = UIApplication.sharedApplication();
-  var enabledTypes = 0;
-  if (app.currentUserNotificationSettings) {
-    var settings = app.currentUserNotificationSettings();
-    enabledTypes = settings.plusGetAttribute("types");
-    console.log("enabledTypes1:" + enabledTypes);
-    if (enabledTypes == 0) {
-      console.log("推送权限没有开启");
-    } else {
-      result = true;
-      console.log("已经开启推送功能!");
-    }
-    plus.ios.deleteObject(settings);
-  } else {
-    enabledTypes = app.enabledRemoteNotificationTypes();
-    if (enabledTypes == 0) {
-      console.log("推送权限没有开启!");
-    } else {
-      result = true;
-      console.log("已经开启推送功能!");
-    }
-    console.log("enabledTypes2:" + enabledTypes);
-  }
-  plus.ios.deleteObject(app);
-  plus.ios.deleteObject(UIApplication);
-  return result;
-}
-
-// 判断定位权限是否开启
-function judgeIosPermissionLocation() {
-  var result = false;
-  var cllocationManger = plus.ios.import("CLLocationManager");
-  var status = cllocationManger.authorizationStatus();
-  result = status != 2;
-  console.log("定位权限开启：" + result);
-  // 以下代码判断了手机设备的定位是否关闭，推荐另行使用方法 checkSystemEnableLocation
-  var enable = cllocationManger.locationServicesEnabled();
-  var status = cllocationManger.authorizationStatus();
-  console.log("enable:" + enable);
-  console.log("status:" + status);
-  if (enable && status != 2) {
-    result = true;
-    console.log("手机定位服务已开启且已授予定位权限");
-  } else {
-    console.log("手机系统的定位没有打开或未给予定位权限");
-  }
-  plus.ios.deleteObject(cllocationManger);
-  return result;
-}
-
-// 判断麦克风权限是否开启
-function judgeIosPermissionRecord() {
-  var result = false;
-  var avaudiosession = plus.ios.import("AVAudioSession");
-  var avaudio = avaudiosession.sharedInstance();
-  var permissionStatus = avaudio.recordPermission();
-  console.log("permissionStatus:" + permissionStatus);
-  if (permissionStatus == 1684369017 || permissionStatus == 1970168948) {
-    console.log("麦克风权限没有开启");
-  } else {
-    result = true;
-    console.log("麦克风权限已经开启");
-  }
-  plus.ios.deleteObject(avaudiosession);
-  return result;
-}
-
-// 判断相机权限是否开启
-function judgeIosPermissionCamera() {
-  var result = false;
-  var AVCaptureDevice = plus.ios.import("AVCaptureDevice");
-  var authStatus = AVCaptureDevice.authorizationStatusForMediaType("vide");
-  console.log("authStatus:" + authStatus);
-  if (authStatus == 3) {
-    result = true;
-    console.log("相机权限已经开启");
-  } else {
-    console.log("相机权限没有开启");
-  }
-  plus.ios.deleteObject(AVCaptureDevice);
-  return result;
-}
-
-// 判断相册权限是否开启
-function judgeIosPermissionPhotoLibrary() {
-  var result = false;
-  var PHPhotoLibrary = plus.ios.import("PHPhotoLibrary");
-  var authStatus = PHPhotoLibrary.authorizationStatus();
-  console.log("authStatus:" + authStatus);
-  if (authStatus == 3) {
-    result = true;
-    console.log("相册权限已经开启");
-  } else {
-    console.log("相册权限没有开启");
-  }
-  plus.ios.deleteObject(PHPhotoLibrary);
-  return result;
-}
-
-// 判断通讯录权限是否开启
-function judgeIosPermissionContact() {
-  var result = false;
-  var CNContactStore = plus.ios.import("CNContactStore");
-  var cnAuthStatus = CNContactStore.authorizationStatusForEntityType(0);
-  if (cnAuthStatus == 3) {
-    result = true;
-    console.log("通讯录权限已经开启");
-  } else {
-    console.log("通讯录权限没有开启");
-  }
-  plus.ios.deleteObject(CNContactStore);
-  return result;
-}
-
-// 判断日历权限是否开启
-function judgeIosPermissionCalendar() {
-  var result = false;
-  var EKEventStore = plus.ios.import("EKEventStore");
-  var ekAuthStatus = EKEventStore.authorizationStatusForEntityType(0);
-  if (ekAuthStatus == 3) {
-    result = true;
-    console.log("日历权限已经开启");
-  } else {
-    console.log("日历权限没有开启");
-  }
-  plus.ios.deleteObject(EKEventStore);
-  return result;
-}
-
-// 判断备忘录权限是否开启
-function judgeIosPermissionMemo() {
-  var result = false;
-  var EKEventStore = plus.ios.import("EKEventStore");
-  var ekAuthStatus = EKEventStore.authorizationStatusForEntityType(1);
-  if (ekAuthStatus == 3) {
-    result = true;
-    console.log("备忘录权限已经开启");
-  } else {
-    console.log("备忘录权限没有开启");
-  }
-  plus.ios.deleteObject(EKEventStore);
-  return result;
-}
-
-// Android权限查询
-function requestAndroidPermission(permissionID) {
-  return new Promise((resolve, reject) => {
-    plus.android.requestPermissions(
-      [permissionID], // 理论上支持多个权限同时查询，但实际上本函数封装只处理了一个权限的情况。有需要的可自行扩展封装
-      function (resultObj) {
-        var result = 0;
-        for (var i = 0; i < resultObj.granted.length; i++) {
-          var grantedPermission = resultObj.granted[i];
-          console.log("已获取的权限：" + grantedPermission);
-          result = 1;
-        }
-        for (var i = 0; i < resultObj.deniedPresent.length; i++) {
-          var deniedPresentPermission = resultObj.deniedPresent[i];
-          console.log("拒绝本次申请的权限：" + deniedPresentPermission);
-          result = 0;
-        }
-        for (var i = 0; i < resultObj.deniedAlways.length; i++) {
-          var deniedAlwaysPermission = resultObj.deniedAlways[i];
-          console.log("永久拒绝申请的权限：" + deniedAlwaysPermission);
-          result = -1;
-        }
-        resolve(result);
-        // 若所需权限被拒绝,则打开APP设置界面,可以在APP设置界面打开相应权限
-        // if (result != 1) {
-        // gotoAppPermissionSetting()
-        // }
-      },
-      function (error) {
-        console.log("申请权限错误：" + error.code + " = " + error.message);
-        resolve({
-          code: error.code,
-          message: error.message,
-        });
-      }
-    );
-  });
-}
-
-// 使用一个方法，根据参数判断权限
-function judgeIosPermission(permissionID) {
-  if (permissionID == "location") {
-    return judgeIosPermissionLocation();
-  } else if (permissionID == "camera") {
-    return judgeIosPermissionCamera();
-  } else if (permissionID == "photoLibrary") {
-    return judgeIosPermissionPhotoLibrary();
-  } else if (permissionID == "record") {
-    return judgeIosPermissionRecord();
-  } else if (permissionID == "push") {
-    return judgeIosPermissionPush();
-  } else if (permissionID == "contact") {
-    return judgeIosPermissionContact();
-  } else if (permissionID == "calendar") {
-    return judgeIosPermissionCalendar();
-  } else if (permissionID == "memo") {
-    return judgeIosPermissionMemo();
-  }
-  return false;
-}
-
-// 跳转到**应用**的权限页面
-function gotoAppPermissionSetting() {
-  if (isIos) {
-    var UIApplication = plus.ios.import("UIApplication");
-    var application2 = UIApplication.sharedApplication();
-    var NSURL2 = plus.ios.import("NSURL");
-    // var setting2 = NSURL2.URLWithString("prefs:root=LOCATION_SERVICES");
-    var setting2 = NSURL2.URLWithString("app-settings:");
-    application2.openURL(setting2);
-
-    plus.ios.deleteObject(setting2);
-    plus.ios.deleteObject(NSURL2);
-    plus.ios.deleteObject(application2);
-  } else {
-    // console.log(plus.device.vendor);
-    var Intent = plus.android.importClass("android.content.Intent");
-    var Settings = plus.android.importClass("android.provider.Settings");
-    var Uri = plus.android.importClass("android.net.Uri");
-    var mainActivity = plus.android.runtimeMainActivity();
-    var intent = new Intent();
-    intent.setAction(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
-    var uri = Uri.fromParts("package", mainActivity.getPackageName(), null);
-    intent.setData(uri);
-    mainActivity.startActivity(intent);
-  }
-}
-
-// 检查系统的设备服务是否开启
-// var checkSystemEnableLocation = async function () {
-function checkSystemEnableLocation() {
-  if (isIos) {
-    var result = false;
-    var cllocationManger = plus.ios.import("CLLocationManager");
-    var result = cllocationManger.locationServicesEnabled();
-    console.log("系统定位开启:" + result);
-    plus.ios.deleteObject(cllocationManger);
-    return result;
-  } else {
-    var context = plus.android.importClass("android.content.Context");
-    var locationManager = plus.android.importClass(
-      "android.location.LocationManager"
-    );
-    var main = plus.android.runtimeMainActivity();
-    var mainSvr = main.getSystemService(context.LOCATION_SERVICE);
-    var result = mainSvr.isProviderEnabled(locationManager.GPS_PROVIDER);
-    console.log("系统定位开启:" + result);
-    return result;
-  }
-}
-
-module.exports = {
-  judgeIosPermission: judgeIosPermission,
-  requestAndroidPermission: requestAndroidPermission,
-  checkSystemEnableLocation: checkSystemEnableLocation,
-  gotoAppPermissionSetting: gotoAppPermissionSetting,
-};

main.js

@@ -2,44 +2,48 @@ import Vue from "vue";
 import App from "./App";
 import * as filters from "./utils/filters.js"; // global filter
 import uView from "uview-ui";
-import empty from "./components/empty";
 import store from "./store";
 
+
+/**
+ * 仅在h5中显示唤醒app功能
+ * 在h5页面手动挂载
+ * 
+ */
 // #ifdef H5
-// 在h5页面手动挂载 h5唤醒app插件
 import airBtn from "@/components/m-airbtn/index.vue";
 let btn = Vue.component("airBtn", airBtn); //全局注册
 document.body.appendChild(new btn().$mount().$el);
 // #endif
 
+
+/**
+ * 全局filters
+ */
+
 Object.keys(filters).forEach((key) => {
   Vue.filter(key, filters[key]);
 });
 
-const msg = (title, duration = 1500, mask = false, icon = "none") => {
-  //统一提示方便全局修改
-  if (Boolean(title) === false) {
-    return;
-  }
-  uni.showToast({
-    title,
-    duration,
-    mask,
-    icon,
-  });
-};
-// 引入vuex
+// 引入Vuex
 Vue.prototype.$store = store;
-// 全局引入空组件
-Vue.component("empty", empty);
 Vue.use(uView);
 Vue.config.productionTip = false;
+
+
+/**
+ * 注意！
+ * 此处将常用的颜色嵌入到原型链上面
+ * 颜色使用驼峰命名对应 uni.scss中全局颜色变量名
+ * 如需更换主题请修改此处以及uni.scss中的全局颜色
+ */
 // 主题色
 Vue.prototype.$mainColor = "#ff3c2a";
 // 高亮主题色
 Vue.prototype.$lightColor = "#ff6b35";
-// 可直接 this.$api调用
-Vue.prototype.$api = { msg };
+// 辅助高亮颜色
+Vue.prototype.$aiderLightColor = "#ff9f28";
+
 
 App.mpType = "app";
 

manifest.json

@@ -2,8 +2,8 @@
     "name" : "lili商城",
     "appid" : "__UNI__C100675",
     "description" : "",
-    "versionName" : "4.0.16",
-    "versionCode" : 4000016,
+    "versionName" : "4.0.42",
+    "versionCode" : 4000042,
     "transformPx" : false,
     "app-plus" : {
         "compatible" : {
@@ -81,8 +81,8 @@
                 "payment" : {
                     "weixin" : {
                         "__platform__" : [ "ios", "android" ],
-                        "appid" : "wx6cfbe6e0ace12ce8",
-                        "UniversalLinks" : "https://m-b2b2c.pickmall.cn/"
+                        "appid" : "wx32788b91bdb614c0",
+                        "UniversalLinks" : "https://m-b2b2c.pickmall.cn/app/"
                     },
                     "alipay" : {
                         "__platform__" : [ "ios", "android" ]
@@ -91,15 +91,15 @@
                 "ad" : {},
                 "share" : {
                     "weixin" : {
-                        "appid" : "wx6cfbe6e0ace12ce8",
-                        "UniversalLinks" : "https://m-b2b2c.pickmall.cn/"
+                        "appid" : "wx32788b91bdb614c0",
+                        "UniversalLinks" : "https://m-b2b2c.pickmall.cn/app/"
                     }
                 },
                 "oauth" : {
                     "weixin" : {
-                        "appid" : "wx6cfbe6e0ace12ce8",
-                        "appsecret" : "6dfbe0c72380dce5d49d65b3c91059b1",
-                        "UniversalLinks" : "https://m-b2b2c.pickmall.cn/"
+                        "appid" : "wx32788b91bdb614c0",
+                        "appsecret" : "230233cef7520ee935bbecad372a370e",
+                        "UniversalLinks" : "https://m-b2b2c.pickmall.cn/app/"
                     },
                     "apple" : {},
                     "qq" : {
@@ -185,13 +185,23 @@
         "setting" : {
             "urlCheck" : false,
             "minified" : true,
-            "postcss" : true,
+            "postcss" : false,
             "es6" : true
         },
         "permission" : {
             "scope.userLocation" : {
                 "desc" : "位置信息将用于高德地图的效果展示"
             }
+        },
+        "plugins" : {
+            "myPlugin" : {
+                "version" : "1.1.0",
+                "provider" : "wx738958e0f4c894f9"
+            },
+            "live-player-plugin" : {
+                "version" : "1.3.0",
+                "provider" : "wx2b03c6e691cd7370"
+            }
         }
     },
     "h5" : {
@@ -210,6 +220,7 @@
                 "enable" : true
             }
         },
-        "title" : "lilishop"
+        "title" : "lilishop",
+        "template" : ""
     }
 }

package-lock.json

@@ -1,42 +0,0 @@
-{
-  "requires": true,
-  "lockfileVersion": 1,
-  "dependencies": {
-    "async-validator": {
-      "version": "1.12.2",
-      "resolved": "https://registry.npmjs.org/async-validator/-/async-validator-1.12.2.tgz",
-      "integrity": "sha512-57EETfCPFiB7M4QscvQzWSGNsmtkjjzZv318SK1CBlstk+hycV72ocjriMOOM48HjvmoAoJGpJNjC7Z76RlnZA=="
-    },
-    "core-js": {
-      "version": "2.6.11",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz",
-      "integrity": "sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg=="
-    },
-    "deepmerge": {
-      "version": "1.5.2",
-      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-1.5.2.tgz",
-      "integrity": "sha512-95k0GDqvBjZavkuvzx/YqVLv/6YYa17fz6ILMSf7neqQITCPbnfEnQvEgMPNjH4kgobe7+WIL0yJEHku+H3qtQ=="
-    },
-    "popper.js": {
-      "version": "0.6.4",
-      "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-0.6.4.tgz",
-      "integrity": "sha1-GDfEdgr1TSuyC2b5wJuSmT2Exik="
-    },
-    "uview": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/uview/-/uview-0.1.0.tgz",
-      "integrity": "sha1-tASc8q1kE1430huAdCtjeoLl7yo=",
-      "requires": {
-        "async-validator": "^1.7.1",
-        "core-js": "^2.4.1",
-        "deepmerge": "^1.5.0",
-        "popper.js": "^0.6.4"
-      }
-    },
-    "xmldom": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.3.0.tgz",
-      "integrity": "sha512-z9s6k3wxE+aZHgXYxSTpGDo7BYOUfJsIRyoZiX6HTjwpwfS2wpQBQKa2fD+ShLyPkqDYo5ud7KitmLZ2Cd6r0g=="
-    }
-  }
-}

pages.json

@@ -36,20 +36,6 @@
 				
 			}
 		},
-		{
-			"path": "pages/navigation/point/point-mall",
-			"style": {
-				"navigationBarTitleText": "积分商城",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/navigation/selectShops",
-			"style": {
-				"navigationBarTitleText": "精选店铺"
-			}
-		},
-
 				
 		{
 			"path": "pages/navigation/search/searchPage",
@@ -176,7 +162,28 @@
 				{
 					"path": "deposit/index",
 					"style": {
-						"navigationBarTitleText": "预存款列表"
+						"navigationStyle": "custom"
+
+					}
+				},
+				{
+					"path": "deposit/operation",
+					"style": {
+						"navigationStyle": "custom"
+
+					}
+				},
+				{
+					"path": "deposit/recharge",
+					"style": {
+						"navigationBarTitleText": "充值金额"
+
+					}
+				},
+				{
+					"path": "deposit/withdrawal",
+					"style": {
+						"navigationBarTitleText": "提现金额"
 
 					}
 				},
@@ -189,11 +196,6 @@
 				}
 			},
 				 {
-					"path": "aboutUs",
-					"style": {
-						"navigationBarTitleText": "关于我们"
-					}
-				}, {
 					"path": "address/address",
 					"style": {
 						"enablePullDownRefresh": true,
@@ -212,6 +214,13 @@
 						"navigationBarTitleText": "地址管理"
 					}
 				},
+				{
+					"path": "set/versionFunctionList",
+					"style": {
+						"navigationBarTitleText": "功能介绍"
+					}
+				},
+
 				{
 					"path": "set/securityCenter/fingerLogin",
 					"style": {
@@ -251,7 +260,7 @@
 				{
 					"path": "set/editionIntro",
 					"style": {
-						"navigationBarTitleText": "版本说明"
+						"navigationBarTitleText": "关于我们"
 					}
 				},
 				{
@@ -328,7 +337,18 @@
 			"pages": [{
 				"path": "shopPage",
 				"style": {
-						"navigationBarTitleText": "详情展示",
+					"navigationBarTitleText": "",
+					"navigationStyle": "custom"
+				}
+			},{
+				"path": "licencePhoto",
+				"style": {
+					"navigationBarTitleText": "营业执照"
+				}
+			},{
+				"path": "shopPageGoods",
+				"style": {
+					"navigationBarTitleText": "",
 					"navigationStyle": "custom"
 				}
 			},
@@ -364,6 +384,17 @@
 						//app页面不显示滚动条
 						"scrollIndicator": "none"
 					}
+				},
+				{ // 客服
+					"path": "customerservice/index",
+					"style": {
+						"navigationBarTitleText": "客服",
+						"usingComponents": {
+							// #ifdef MP-WEIXIN
+							"chat": "plugin://myPlugin/chat"
+							// #endif
+						}
+					}
 				}
 			]
 
@@ -403,7 +434,9 @@
 				{
 					"path": "wechatMPLogin",
 					"style": {
-						"navigationBarTitleText": "小程序登录"
+						"navigationBarTitleText": "小程序登录",
+						"navigationStyle": "custom",
+						"navigationBarTextStyle": "black"
 					}
 				}
 			]
@@ -424,7 +457,9 @@
 					"style": {
 						"navigationBarTitleText": "限时抢购",
 						"app-plus": {
-							"titleNView": {}
+							"titleNView": {
+								"homeButton":true
+							}
 						}
 					}
 				},
@@ -446,6 +481,46 @@
 						"navigationBarTitleText": "人气推荐",
 						"navigationStyle": "custom"
 
+					}
+				},{
+					"path": "lives",
+					"style": {
+						"navigationStyle": "custom",
+						"navigationBarTextStyle": "black"
+
+					}
+				},{
+					"path": "bargain/list",
+					"style": {
+						"navigationStyle": "custom",
+						"navigationBarTextStyle": "white"
+
+					}
+				},{
+					"path": "bargain/detail",
+					"style": {
+						"navigationStyle": "custom",
+						"navigationBarTextStyle": "white"
+
+					}
+				},{
+					"path": "bargain/log",
+					"style": {
+						"navigationBarTitleText": "砍价记录"
+					}
+				},{
+					"path": "point/detail",
+					"style": {
+						"navigationStyle": "custom",
+						"navigationBarTextStyle": "white"
+
+					}
+				},{
+					"path": "point/pointList",
+					"style": {
+						"navigationBarTitleText": "积分商城"
+						
+
 					}
 				}
 
@@ -459,16 +534,8 @@
 					"style": {
 						"navigationBarTitleText": "我的优惠券",
 						"app-plus": {
-							"bounce": "coupon/none",
-							"titleNView": {
-								"padding-right": "12",
-								"buttons": [{
-									"fontSrc": "/static/font/iconfont/iconfont.ttf",
-									"text": "\ue608",
-									"fontSize": "20",
-									"color": "#FFFFFF"
-								}]
-							}
+							"bounce": "coupon/none"
+							
 						}
 					}
 				},
@@ -489,19 +556,8 @@
 					"path": "coupon/couponCenter",
 					"style": {
 						"navigationBarTitleText": "领券中心",
-						"enablePullDownRefresh": true,
-						"app-plus": {
-							"bounce": "none",
-							"titleNView": {
-								"padding-right": "12",
-								"buttons": [{
-									"fontSrc": "/static/font/iconfont/iconfont.ttf",
-									"text": "\ue608",
-									"fontSize": "20",
-									"color": "#FFFFFF"
-								}]
-							}
-						}
+						"enablePullDownRefresh": true
+						
 					}
 				},
 				{
@@ -566,6 +622,7 @@
 						"enablePullDownRefresh": true,
 						"app-plus": {
 							"bounce": "none"
+						
 						}
 					}
 				},
@@ -694,12 +751,6 @@
 				"text": "分类"
 			},
 		
-			// {
-			// 	"pagePath": "pages/navigation/point/point-mall",
-			// 	"iconPath": "static/tabbar/point-mall.png",
-			// 	"selectedIconPath": "static/tabbar/point-mall-s.png",
-			// 	"text": "积分商城"
-			// },
 			{
 				"pagePath": "pages/tabbar/cart/cartList",
 				"iconPath": "static/tabbar/cart.png",

pages/cart/coupon/index.vue

@@ -1,9 +1,12 @@
 <template>
   <div class="wrapper">
+    <u-tabs :list="list" :is-scroll="false" :active-color="lightColor" :current="current" @change="(i)=>{current = i}">
+    </u-tabs>
+
     <div class="empty" v-if="couponsList.length <= 0">
       <u-empty text="暂无优惠券" mode="coupon"></u-empty>
     </div>
-    <view class="coupon-item" v-for="(item, index) in couponsList" :key="index" v-if="item.memberCouponStatus == 'NEW'">
+    <view class="coupon-item" v-for="(item, index) in couponsList" :key="index" >
       <view class="left">
         <view class="wave-line">
           <view class="wave" v-for="(item, index) in 12" :key="index"></view>
@@ -19,15 +22,16 @@
         <view class="circle circle-bottom"></view>
       </view>
       <view class="right">
-        <view>
+        <view class="desc">
           <view v-if="item.scopeType">
             <span v-if="item.scopeType == 'ALL' && item.id == 'platform'">全平台</span>
             <span v-if="item.scopeType == 'PORTION_CATEGORY'">仅限品类</span>
             <view v-else>{{  item.storeName == 'platform' ? '全平台' :item.storeName+'店铺' }}使用</view>
           </view>
-          <view>有效期至：{{item.endTime}}</view>
+          <view class="reason" v-if="item.reason">{{item.reason}}</view>
+          <view class="end-time">有效期至:{{item.endTime}}</view>
         </view>
-        <view class="receive" @click="clickWay(item)">
+        <view class="receive" v-if="current ==0" @click="clickWay(item)">
           <text>立即</text><br />
           <text>使用</text>
         </view>
@@ -37,11 +41,21 @@
   </div>
 </template>
 <script>
-import { useCoupon, getMemberCanUse } from "@/api/trade.js";
+import { useCoupon } from "@/api/trade.js";
 
 export default {
   data() {
     return {
+      lightColor: this.$lightColor,
+      current: 0,
+      list: [
+        {
+          name: "可用优惠券",
+        },
+        {
+          name: "不可用优惠券",
+        },
+      ],
       couponsList: [], //优惠券集合
       params: {
         //传参
@@ -55,36 +69,26 @@ export default {
       routerVal: "", //上级传参
     };
   },
-  /**
-   * 赋值
-   */
-  onLoad(val) {
-    this.routerVal = val;
-    this.params.scopeId = val.skuId;
-    this.params.storeId = val.storeId;
+  watch: {
+    current(val) {
+      console.log(this.$store.state.cantUseCoupons);
+      val == 0
+        ? (this.couponsList = this.$store.state.canUseCoupons)
+        : (this.couponsList = this.$store.state.cantUseCoupons);
     },
+  },
+
   mounted() {
-    uni.getStorage({
-      key: "totalPrice",
-      success: (res) => {
-        this.params.totalPrice = res.data;
-        this.getCoupons();
-      },
-    });
+    this.init();
   },
 
   methods: {
     /**
-     * 获取优惠券数量
+     * 从vuex中拿取优惠券信息
      */
-    getCoupons() {
-      getMemberCanUse(this.params).then((res) => {
-        if (res.data.success) {
-          this.couponsList = res.data.result.records;
-        }
-      });
+    init() {
+      this.couponsList = this.$store.state.canUseCoupons;
     },
-
     /**
      * 领取优惠券
      */
@@ -109,6 +113,19 @@ export default {
 };
 </script>
 <style scoped lang="scss">
+.desc {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+}
+.end-time,
+.reason {
+  color: #999;
+  line-height: 1.5;
+  font-size: 24rpx;
+}
+
 .empty {
   margin-top: 20px;
   text-align: center;

pages/cart/coupon/myCoupon.vue

@@ -11,6 +11,7 @@
         <scroll-view class="list-scroll-content" scroll-y @scrolltolower="loadData">
           <!-- 空白页 -->
           <u-empty mode="coupon" text="暂无优惠券了" v-if="navItem.wheterEmpty"></u-empty>
+       
           <!-- 数据 -->
           <view v-if="navItem.dataList && coupon" class="coupon-item" :class="{ 'coupon-used': navIndex != 0 }" v-for="(coupon, index) in navItem.dataList" :key="index">
             <view class="left">
@@ -47,7 +48,7 @@
                 <text class="text-2" v-if="coupon.used_status == 1">将过期</text>
               </view>
               <image class="no-icon" v-if="navIndex == 1" src="@/static/img/used.png"></image>
-              <image class="no-icon" v-if="navIndex == 2" src="@/pages/floor/imgs/overdue.png"></image>
+              <image class="no-icon" v-if="navIndex == 2" src="@/static/img/overdue.png"></image>
               <view class="receive" v-if="navIndex == 0" @click="useItNow(coupon)">
                 <text>立即</text><br />
                 <text>使用</text>
@@ -112,7 +113,7 @@ export default {
     };
   },
 
-  onLoad() {
+  onShow() {
     this.getData();
   },
 
@@ -142,7 +143,7 @@ export default {
       let index = this.tabCurrentIndex;
       getMemberCoupons(this.navList[index].params).then((res) => {
         uni.stopPullDownRefresh();
-        if (res.statusCode == 200) {
+        if (res.data.success) {
           let data = res.data.result.records;
           if (data.length == 0) {
             if (res.data.pageNumber == 1) {
@@ -157,6 +158,7 @@ export default {
             this.navList[index].dataList.push(...data);
           }
         }
+        console.log(this.navList[index].dataList)
         uni.hideLoading();
       });
     },
@@ -220,7 +222,7 @@ $item-color: #fff;
 }
 
 .swiper-box {
-  height: calc(100% - 40px);
+  height: calc(100vh - 40px);
 }
 
 .list-scroll-content {

pages/cart/payment/payOrder.vue

@@ -6,8 +6,7 @@
         <p class="ptips">收银台</p>
 
         <p class="ptips">剩余支付时间：
-					<u-count-down :show-days="false" :show-border="true" font-size="28" color="#008ffa"
-						border-color="#008ffa" ref="uCountDown" :timestamp="autoCancel"></u-count-down>
+          <u-count-down :show-days="false" :show-border="true" font-size="28" color="#008ffa" border-color="#008ffa" ref="uCountDown" :timestamp="autoCancel"></u-count-down>
         </p>
         <p class="ptips">
           支付金额
@@ -45,7 +44,7 @@
 </template>
 <script>
 	import * as API_Trade from "@/api/trade";
-
+	import {payCallback} from '@/api/members'
 	export default {
 		data() {
 			return {
@@ -71,6 +70,7 @@
 				walletValue: 0.0,
 				// 支付倒计时
 				autoCancel: 0,
+			
 			};
 		},
 		onLoad(val) {
@@ -91,12 +91,23 @@
 			// 区别是：h5是通过浏览器外部调用微信app进行支付，而JSAPI则是 在微信浏览器内部，或者小程序 调用微信支付
 			this.paymentClient = this.isWeiXin() ? "JSAPI" : "H5";
 			//#endif
+
+
+
+			// 
 		},
 		onBackPress(e) {
 			if (e.from == "backbutton") {
+				if(this.routerVal.recharge_sn){
+					uni.switchTab({
+						 url: '/pages/tabbar/user/my'
+					});
+				}
+				else{
 				uni.redirectTo({
 					url: "/pages/order/myOrder?status=0",
 				});
+				}
 				return true; //阻止默认返回行为
 			}
 		},
@@ -104,16 +115,28 @@
 			this.cashierData();
 		},
 		methods: {
-			navigateTo(url) {
+
+			/**
+			 * 支付成功后跳转
+			 */
+			callback(paymentMethod){
 				uni.navigateTo({
-					url,
+					url: "/pages/cart/payment/success?paymentMethod=" +
+					paymentMethod +
+					"&payPrice=" +
+					this.cashierParams.price+
+					"&orderType="+this.orderType 
 				});
 			},
-			// 获取收银详情
+			
+			/**
+			 * 获取收银详情
+			 */
 			cashierData() {
 				let parms = {};
 
 				if (this.routerVal.recharge_sn) {
+					// 判断当前是否是充值
 					this.sn = this.routerVal.recharge_sn;
 					this.orderType = "RECHARGE";
 				} else if (this.routerVal.trade_sn) {
@@ -128,6 +151,8 @@
 				parms.clientType = this.paymentType;
 
 				API_Trade.getCashierData(parms).then((res) => {
+				
+					if(res.data.success){
 					this.cashierParams = res.data.result;
 
 					// #ifdef MP-WEIXIN
@@ -137,23 +162,54 @@
 					// #endif
 
 					// #ifndef MP-WEIXIN
+				    if(this.routerVal.recharge_sn){
+					 this.payList = res.data.result.support.filter((item) => {
+						return item != "WALLET";
+					 })
+					}
+					 else{
 						this.payList = res.data.result.support;
+					}
+					// #ifndef APP-PLUS
+					//判断是否微信浏览器
+					var ua = window.navigator.userAgent.toLowerCase();
+					if (ua.match(/MicroMessenger/i) == 'micromessenger') {
+					
+						this.payList = res.data.result.support.filter((item) => {
+							return item != "ALIPAY";
+						});
+						
+					}
 					// #endif
+					
+					// #endif
+					
+
 					this.walletValue = res.data.result.walletValue;
 					this.autoCancel =
 						(res.data.result.autoCancel - new Date().getTime()) / 1000;
+					}
+					else if(res.data.code == 32000){
+						setTimeout(()=>{
+							uni.redirectTo({
+							 url: `/pages/order/myOrder?status=0`
+						});
+						},500)
+						
+					}
 				});
 			},
 
 
 			awaitPay(payment){
-
-				 this.$u.debounce(this.pay(payment), 3000)
-			
+				this.$u.throttle(()=>{
+					this.pay(payment)
+				}, 2000)
 			},
 
 			//订单支付
 			async pay(payment) {
+				
 				// 支付编号
 				const sn = this.sn;
 				// 交易类型【交易号|订单号】
@@ -179,16 +235,15 @@
 
 						//如果支付异常
 						if (!signXml.data.success) {
-							uni.showModal({
-								content: signXml.data.message,
-								showCancel: false,
-							})
+							uni.showToast({
+								title: signXml.data.message,
+								duration: 2000
+							});
 							return;
 						}
 
 						let payForm = signXml.data.result;
 
-						console.log(payForm)
 						let paymentType = paymentMethod === "WECHAT" ? "wxpay" : "alipay";
 						uni.requestPayment({
 							provider: paymentType,
@@ -199,15 +254,13 @@
 									icon: "none",
 									title: "支付成功!",
 								});
-								uni.navigateTo({
-									url: "/pages/payment/success?paymentType=" +
-										paymentType +
-										"&payPrice=" +
-										this.cashierParams.price,
-								});
+
+								this.callback(paymentMethod)
+								
+								 
 							},
 							fail: (e) => {
-								console.log(e);
+								console.log(this);
 								this.exception = e;
 								uni.showModal({
 									content: "支付失败,如果您已支付，请勿反复支付",
@@ -225,16 +278,18 @@
 				await API_Trade.initiatePay(paymentMethod, paymentClient, params).then(
 					(res) => {
 						let response = res.data;
+						//如果非支付宝支付才需要进行判定，因为支付宝h5支付是直接输出的，没有返回所谓的消息状态
+						if(paymentMethod !== "ALIPAY"){
 							//如果支付异常
 							if (!response.success) {
-
-							uni.showModal({
-								content: response.message,
-								showCancel: false,
-							})
+								uni.showToast({
+									title: response.message,
+									duration: 2000,
+									icon:"none"
+								});
 								return;
 							}
-
+						}
 						if (paymentMethod === "ALIPAY") {
 							document.write(response);
 						} else if (paymentMethod === "WECHAT") {
@@ -243,7 +298,7 @@
 								WeixinJSBridge.invoke(
 									"getBrandWCPayRequest",
 									response.result,
-									function(res) {
+									(res) => {
 										if (res.err_msg == "get_brand_wcpay_request:ok") {
 											// 使用以上方式判断前端返回,微信团队郑重提示：
 											//res.err_msg将在用户支付成功后返回ok，但并不保证它绝对可靠。
@@ -251,12 +306,8 @@
 												icon: "none",
 												title: "支付成功!",
 											});
-											uni.navigateTo({
-												url: "/pages/cart/payment/success?paymentMethod=" +
-													paymentMethod +
-													"&payPrice=" +
-													this.cashierParams.price,
-											});
+											this.callback(paymentMethod)
+											 
 										} else {
 											uni.showModal({
 												content: "支付失败,如果您已支付，请勿反复支付",
@@ -274,12 +325,7 @@
 								icon: "none",
 							});
 							if (response.success) {
-								uni.navigateTo({
-									url: "/pages/cart/payment/success?paymentMethod=" +
-										paymentMethod +
-										"&payPrice=" +
-										this.cashierParams.price,
-								});
+								this.callback(paymentMethod)
 							}
 						}
 					}
@@ -315,12 +361,8 @@
 										icon: "none",
 										title: "支付成功!",
 									});
-									uni.navigateTo({
-										url: "/pages/cart/payment/success?paymentMethod=" +
-											paymentType +
-											"&payPrice=" +
-											this.cashierParams.price,
-									});
+									this.callback(paymentMethod)
+									 
 								},
 								fail: (e) => {
 									console.log(e);
@@ -336,12 +378,8 @@
 								icon: "none",
 								title: "支付成功!",
 							});
-							uni.navigateTo({
-								url: "/pages/cart/payment/success?paymentMethod=" +
-									paymentMethod +
-									"&payPrice=" +
-									this.cashierParams.price,
-							});
+							this.callback(paymentMethod)
+							 
 						}
 					}
 				);

pages/cart/payment/popup/goods.vue

@@ -1,19 +1,21 @@
 <template>
   <div class="wrapper">
-    <u-popup class="popup" v-model="buyMask" :height="setup.height" closeable :mode="setup.mode" :mask-close-able="isClose" :mask="isMask" :border-radius="setup.radius" @close="closeMask()">
+    <u-popup class="popup" v-model="buyMask" :height="setup.height" closeable :mode="setup.mode"
+      :mask-close-able="isClose" :mask="isMask" :border-radius="setup.radius" @close="closeMask()">
       <!-- 商品 -->
       <view class="goods-box bottom">
         <view class="goods-header">
           <view class="goods-img">
-            <u-image width="200rpx" border-radius="20" class="uimage" height="200rpx" :src="selectedSpecImg ? selectedSpecImg : goodsDetail.thumbnail"></u-image>
+            <u-image width="200rpx" border-radius="20" class="uimage" height="200rpx"
+              :src="selectedSpecImg ? selectedSpecImg : goodsDetail.thumbnail"></u-image>
           </view>
           <view class="goods-skus">
-
             <!-- 有活动商品价格 -->
             <view class="goods-price " v-if="goodsDetail.promotionPrice">
               <span>
                 ￥
-                <span class="goods-price-promotionShow goods-price-bigshow" v-if="goodsDetail.promotionPrice">{{ formatPrice(goodsDetail.promotionPrice)[0] }}</span>
+                <span class="goods-price-promotionShow goods-price-bigshow"
+                  v-if="goodsDetail.promotionPrice">{{ formatPrice(goodsDetail.promotionPrice)[0] }}</span>
                 .{{ formatPrice(goodsDetail.promotionPrice)[1] }}
                 <span></span>
               </span>
@@ -23,17 +25,18 @@
                 formatPrice(goodsDetail.price)[0]
               }}</span>
                 .{{ formatPrice(goodsDetail.price)[1] }}
-                <span></span>
+
               </div>
             </view>
             <!-- 正常商品的价格 -->
             <view class="goods-price" v-else>
+              <span>
                 ￥
                 <span class="goods-price-bigshow">{{
                 formatPrice(goodsDetail.price)[0]
               }}</span>
                 .{{ formatPrice(goodsDetail.price)[1] }}
-              <span></span>
+              </span>
             </view>
             <view class="goods-check-skus">
               已选
@@ -50,20 +53,24 @@
           <view class="goods-skus-view" :key="specIndex" v-for="(spec, specIndex) in formatList">
             <view class="skus-view-list">
               <view class="view-class-title">{{ spec.name }}</view>
-              <view :class="{ active: spec_val.id == currentSelceted[specIndex] }" class="skus-view-item" v-for="(spec_val, spec_index) in spec.values" :key="spec_index"
+              <view :class="{ active: spec_val.value == currentSelceted[specIndex] }" class="skus-view-item"
+                v-for="(spec_val, spec_index) in spec.values" :key="spec_index"
                 @click="handleClickSpec(spec, specIndex, spec_val)">{{ spec_val.value }}</view>
             </view>
           </view>
           <!-- 数量 -->
           <view class="goods-skus-number">
             <view class="view-class-title">数量</view>
-            <u-number-box :bg-color="numberBox.bgColor" :color="numberBox.color" :input-width="numberBox.width" :input-height="numberBox.height" :size="numberBox.size" :min="1" v-model="num">
+            <u-number-box :bg-color="numberBox.bgColor" :color="numberBox.color" :input-width="numberBox.width"
+              :input-height="numberBox.height" :size="numberBox.size" :min="1" v-model="num">
             </u-number-box>
           </view>
         </view>
         <!-- 按钮 -->
         <view class="btns">
-          <view class="box-btn card" v-if="buyType !='PINTUAN'" @click="addToCartOrBuy('cart')">加入购物车</view>
+
+          <view class="box-btn card" v-if="buyType != 'PINTUAN' && goodsDetail.goodsType!='VIRTUAL_GOODS'"
+            @click="addToCartOrBuy('cart')">加入购物车</view>
           <view class="box-btn buy" @click="addToCartOrBuy('buy')">立即购买</view>
         </view>
       </view>
@@ -99,8 +106,7 @@ export default {
     };
   },
   props: [
-    
-    "goodsDetail",
+    "goodsDetail", //商品详情
     "buyMask",
     "selectedSku",
     "goodsSpec",
@@ -136,14 +142,12 @@ export default {
 
     /**点击规格 */
     handleClickSpec(val, index, specValue) {
-      this.$set(this.currentSelceted, index, specValue.id);
-
+      this.$set(this.currentSelceted, index, specValue.value);
       let selectedSkuId = this.goodsSpec.find((i) => {
         let matched = true;
         let specValues = i.specValues.filter((j) => j.specName !== "images");
-
         for (let n = 0; n < specValues.length; n++) {
-          if (specValues[n].specValueId !== this.currentSelceted[n]) {
+          if (specValues[n].specValue !== this.currentSelceted[n]) {
             matched = false;
             return;
           }
@@ -152,7 +156,6 @@ export default {
           return i;
         }
       });
-
       this.selectSkuList = {
         spec: {
           specName: val.name,
@@ -162,7 +165,10 @@ export default {
       };
       this.selectName = specValue.value;
 
-      this.$emit("handleClickSku", selectedSkuId.skuId,this.goodsDetail.id);
+      this.$emit("handleClickSku", {
+        skuId: selectedSkuId.skuId,
+        goodsId: this.goodsDetail.goodsId,
+      });
     },
 
     /**
@@ -191,30 +197,23 @@ export default {
 
             this.$emit("queryCart");
             this.closeMask();
-          } else {
-            uni.showToast({
-              title: res.data.message,
-              duration: 2000,
-              icon: "none",
-            });
-            return false;
           }
         });
       } else {
         // 判断是否拼团商品
         if (this.buyType) {
           data.cartType = "PINTUAN";
+        } else if (this.goodsDetail.goodsType == "VIRTUAL_GOODS") {
+          data.cartType = "VIRTUAL";
         } else {
           data.cartType = "BUY_NOW";
         }
 
-       
-
         API_trade.addToCart(data).then((res) => {
           if (res.data.code == 200) {
             uni.navigateTo({
               url: `/pages/order/fillorder?way=${data.cartType}&addr=${
-                this.addr.id || ''
+                this.addr.id || ""
               }&parentOrder=${encodeURIComponent(
                 JSON.stringify(this.parentOrder)
               )}`,
@@ -223,16 +222,32 @@ export default {
         });
       }
     },
+
+    /**
+     * 直接购买
+     */
+    buy(data) {
+      API_trade.addToCart(data).then((res) => {
+        if (res.data.success) {
+          uni.navigateTo({
+            url: `/pages/order/fillorder?way=${
+              data.cartType
+            }&addr=${""}&parentOrder=${encodeURIComponent(
+              JSON.stringify(this.parentOrder)
+            )}`,
+          });
+        }
+      });
+    },
+
     formatSku(list) {
       // 格式化数据
 
       let arr = [{}];
       list.forEach((item, index) => {
         item.specValues.forEach((spec, specIndex) => {
-          let id = spec.specNameId;
           let name = spec.specName;
           let values = {
-            id: spec.specValueId,
             value: spec.specValue,
             quantity: item.quantity,
           };
@@ -244,7 +259,7 @@ export default {
             if (
               arrItem.name == name &&
               arrItem.values &&
-              !arrItem.values.find((i) => i.id === values.id)
+              !arrItem.values.find((i) => i.value === values.value)
             ) {
               arrItem.values.push(values);
             }
@@ -254,7 +269,6 @@ export default {
             });
             if (!keys.includes(name)) {
               arr.push({
-                id: id,
                 name: name,
                 values: [values],
               });
@@ -271,7 +285,7 @@ export default {
           item.specValues
             .filter((i) => i.specName !== "images")
             .forEach((value, _index) => {
-              this.currentSelceted[_index] = value.specValueId;
+              this.currentSelceted[_index] = value.specValue;
 
               this.selectName = value.specValue;
 
@@ -289,6 +303,8 @@ export default {
 
   mounted() {
     this.formatSku(this.goodsSpec);
+
+    console.log(this.goodsDetail);
   },
 };
 </script>
@@ -322,10 +338,10 @@ export default {
 }
 
 .active {
-  background: $jd-light-color !important;
-  border: 2rpx solid $jd-color;
+  background: $price-light-color !important;
+  border: 2rpx solid $price-color;
   font-weight: bold;
-  color: $jd-color !important;
+  color: $price-color !important;
   box-sizing: border-box;
 }
 
@@ -377,7 +393,7 @@ export default {
 }
 
 .goods-price {
-  color: $jd-color;
+  color: $price-color;
   line-height: 80rpx;
   display: flex;
 }

pages/cart/payment/popup/popup.scss

@@ -14,7 +14,7 @@
     line-height: 80rpx;
     height: 80rpx;
     
-    background: $jd-color;
+    background: $price-color;
     color: #fff;
     border-radius: 200px;
     text-align: center;

pages/cart/payment/shareOrderGoods.vue

@@ -1,5 +1,5 @@
 <template>
-  <view class="wrapper">
+  <view class="wrapper" v-if="flage">
     <div class='goods' v-if="selectedGoods">
       <image class="goods-image" :src="selectedGoods.thumbnail" alt="">
         <p class="goodsName">{{selectedGoods.goodsName}}</p>
@@ -67,11 +67,12 @@ import { getGoods } from "@/api/goods.js";
 import { getPinTuanShare } from "@/api/order";
 import shares from "@/components/m-share/index";
 import storage from "@/utils/storage.js";
-import popupGoods from "./popup/goods"; //购物车商品的模块
+import popupGoods from "@/components/m-buy/goods"; //购物车商品的模块
 
 export default {
   data() {
     return {
+      flage: false, //判断接口是否正常请求
       addr: {
         id: "",
       },
@@ -138,7 +139,8 @@ export default {
     // 实例化本页面
     async init(sn, sku) {
       let res = await getPinTuanShare(sn, sku);
-      if (res.data.success) {
+      if (res.data.success && res.data.result.promotionGoods) {
+        this.flage = true;
         this.data = res.data.result;
         this.selectedGoods = res.data.result.promotionGoods;
         let endTime = Date.parse(
@@ -170,21 +172,30 @@ export default {
         } else {
           this.isMaster = false;
           // 获取商品详情
-          this.getGoodsDetail(this.routers.sku, this.routers.goodsId);
+          this.getGoodsDetail({
+            id: this.routers.sku,
+            goodsId: this.routers.goodsId,
+          });
         }
 
         // 获取当前商品是否已经购买
         if (storage.getUserInfo().id) {
-         
           let isBuy = res.data.result.pintuanMemberVOS.filter((item) => {
             return item.memberId == storage.getUserInfo().id;
           });
           isBuy.length != 0 ? (this.isBuy = true) : (this.isBuy = false);
         }
+      } else {
+        uni.showToast({
+          title: "当前拼团单有误！请联系管理员重试",
+          duration: 2000,
+          icon: "none",
+        });
       }
     },
     // 获取商品详情
-    getGoodsDetail(id, goodsId) {
+    getGoodsDetail(val) {
+      let { id, goodsId } = val;
       uni.showLoading({
         title: "加载中",
         mask: true,

pages/cart/payment/success.vue

@@ -2,76 +2,45 @@
   <div class="wrapper">
     <div class="pay-wrapper">
       <div class="pay-money">
-        ￥{{ payPrice | unitPrice }}
+        ￥{{ Number(payPrice) | unitPrice }}
       </div>
       <div class="pay-btns">
-        <div v-show="!from" @click="navigateTo('/pages/order/myOrder?status=0')">查看订单</div>
+        <div v-show="!from" @click="checkOrder">查看{{this.orderType == "RECHARGE" ? '余额' : '订单'}}</div>
         <div @click="navigateTo('/pages/tabbar/home/index', 'switch')">回到首页</div>
-
       </div>
     </div>
     <div class="pay-box">
       <div class="pay-tag-box">
         <h2>订单支付成功!</h2>
-
         <div class="pay-item">
           <div>
             支付方式：
           </div>
           <div>{{paymentMethod | paymentTypeFilter}}</div>
         </div>
-
-      </div>
-      <!-- #ifdef MP-WEIXIN -->
-      <div class="subscribe flex">
-        <div>订阅订单状态</div>
-        <div>
-          <u-switch size="50" :disabled="checked" :active-color="activeColor" @change="changeStatus" v-model="checked"></u-switch>
-        </div>
-      </div>
-      <!-- #endif -->
-    </div>
-    <div class="goods-recommend">--商品推荐--</div>
-    <div class="goods-list">
-      <div @click="handleClick(item)" class="goods-item" v-for="(item, item_index) in goodsList" :key="item_index">
-        <div class="goods-img">
-          <u-image :src="item.thumbnail" mode="aspectFill" height="350rpx" width="100%">
-            <u-loading slot="loading"></u-loading>
-          </u-image>
-        </div>
-        <div class="goods-desc">
-          <div class="goods-title">
-            {{ item.goodsName }}
-          </div>
-          <div class="goods-bottom">
-            <div class="goods-price">￥{{ item.price | unitPrice }}</div>
-          </div>
-        </div>
       </div>
     </div>
+    <goodsRecommend />
   </div>
 
-  </div>
 </template>
 <script>
-import { getGoodsList } from "@/api/goods.js";
-import { getWeChatMpMessage } from "@/api/message.js";
-
+import goodsRecommend from "@/components/m-goods-recommend";
 export default {
   data() {
     return {
       checked: false,
       paymentMethod: "",
+
       from: "",
       payPrice: 0,
       goodsList: [],
       activeColor: this.$mainColor,
-      params: {
-        pageSize: 12,
-        pageNumber: 0,
-      },
     };
   },
+  components: {
+    goodsRecommend,
+  },
   filters: {
     paymentTypeFilter(val) {
       switch (val) {
@@ -89,50 +58,30 @@ export default {
   onLoad(options) {
     this.paymentMethod = options.paymentMethod || "";
     this.from = options.from || "";
-    this.payPrice = parseInt(options.payPrice) || 0;
-    //搜索商品
-    this.initGoods();
+    this.payPrice = options.payPrice || 0;
+    this.orderType = options.orderType;
+    // this.sendMessage()
   },
   methods: {
+    checkOrder() {
+      /**
+       * 查看订单
+       * 1.充值跳转到明细里面
+       * 2.支付跳转到订单详情
+       */
+      if (this.orderType == "RECHARGE") {
+        uni.reLaunch({
+          url: `/pages/mine/deposit/operation`,
+        });
+      } else {
+        this.navigateTo("/pages/order/myOrder?status=0");
+      }
+    },
     changeStatus(val) {
       if (val) {
         this.sendMessage();
       }
     },
-    async initGoods() {
-      let goodsList = await getGoodsList(this.params);
-      this.goodsList.push(...goodsList.data.result.content);
-    },
-    sendMessage() {
-      //订阅消息
-      //#ifdef MP-WEIXIN
-      getWeChatMpMessage().then((res) => {
-        var message = res.data.result;
-        var templateid = message.map((item) => item.code);
-        uni.requestSubscribeMessage({
-          tmplIds: templateid,
-          success: (res) => {
-			  for(let key in res){
-				  if(res[key] == "reject"){
-					  this.checked = false;
-				  }
-			  }
-           
-          },
-          fail: (res) => {
-            uni.removeStorageSync("acceptSubscribeMessage");
-            this.checked = false;
-          },
-        });
-      });
-      //#endif
-    },
-
-    handleClick(item) {
-      uni.navigateTo({
-        url: `/pages/product/goods?id=${item.id}&goodsId=${item.goodsId}`,
-      });
-    },
 
     navigateTo(url, type) {
       if (type === "switch") {
@@ -155,7 +104,6 @@ export default {
   margin: 0 auto 40rpx auto;
   padding: 0 20rpx 20rpx;
   width: 80%;
-   
 }
 .pay-btns {
   display: flex;
@@ -221,84 +169,4 @@ export default {
   background: #fff;
   border-top-right-radius: 100rpx;
 }
-
-/**商品代码 */
-$w_94: 94%;
-
-.goods-recommend {
-  background: #f7f7f7;
-  height: 100rpx;
-  line-height: 100rpx;
-  text-align: center;
-  font-size: 30rpx;
-  font-weight: bold;
-}
-
-.goods-list {
-  display: flex;
-
-  flex-wrap: wrap;
-  background: #f7f7f7;
-}
-
-.goods-item {
-  width: 50%;
-  margin-bottom: 10px;
-  border-radius: 0.4em;
-  overflow: hidden;
-}
-
-.goods-img {
-  position: relative;
-  margin: 0 auto;
-  // width: 158px;
-  width: $w_94;
-  height: 350rpx;
-  border-top-left-radius: 20rpx;
-  border-top-right-radius: 20rpx;
-
-  overflow: hidden;
-
-  > img {
-    width: 100%;
-    height: 100%;
-  }
-}
-
-.goods-desc {
-  border-bottom-left-radius: 20rpx;
-  border-bottom-right-radius: 20rpx;
-  width: $w_94;
-  background: #fff;
-  padding: 8rpx 0 8rpx 8rpx;
-  margin: 0 auto;
-
-  > .goods-title {
-    font-size: 12px;
-    height: 70rpx;
-    display: -webkit-box;
-    font-weight: 500;
-    -webkit-box-orient: vertical;
-
-    -webkit-line-clamp: 2;
-
-    overflow: hidden;
-  }
-
-  > .goods-bottom {
-    display: flex;
-    font-weight: bold;
-
-    > .goods-price {
-      line-height: 2;
-      color: $main-color;
-    }
-  }
-}
-
-.goods-icon {
-  right: 10rpx;
-  top: 10rpx;
-  position: absolute;
-}
 </style>

pages/mine/aboutUs.vue

@@ -1,139 +0,0 @@
-<template>
-  <view class="about-us">
-    <view class="box flex-center">
-      <image src="/static/logo.png" mode="scaleToFill"></image>
-      <view>{{config.name}}</view>
-    </view>
-    <u-cell-group :border="false">
-      <!--  #ifdef APP-PLUS -->
-      <u-cell-item title="检查更新" @click="checkUpdate"></u-cell-item>
-      <!--  #endif -->
-      <u-cell-item title="证照信息" @click="navigateTo('/pages/mine/help/tips?type=message')"></u-cell-item>
-      <u-cell-item title="服务协议" @click="navigateTo('/pages/mine/help/tips?type=user')"></u-cell-item>
-      <u-cell-item title="隐私协议" @click="navigateTo('/pages/mine/help/tips?type=privacy')"></u-cell-item>
-      <u-cell-item title="关于我们" :border-bottom="false" @click="navigateTo('/pages/mine/help/tips?type=about')"></u-cell-item>
-    </u-cell-group>
-    <view class="intro flex-center c-content">
-      <view>客服热线：13161366885</view>
-      <view>客服邮箱：lili@lili.com</view>
-    </view>
-    <view class="bottom flex-center">
-      <view @click="navigateTo('/pages/help/tips?type=user')">《lili商城用户协议》</view>
-      <view>CopyRight @ {{config.name}} </view>
-    </view>
-  </view>
-</template>
-
-<script>
-// #ifdef APP-PLUS
-import APPUpdate, { getCurrentNo, getServerNo } from "@/plugins/APPUpdate";
-import { getAppVersionList } from "@/api/message.js";
-// #endif
-import config from "@/config/config";
-export default {
-  data() {
-    return {
-      config,
-      showUpdate: false,
-      version: "",
-      currentNo: 0,
-      params: {
-        pageNumber: 1,
-        pageSize: 5,
-      },
-    };
-  },
-  onLoad() {
-    /**
-     * 根据当前app系统判断
-     */
-    // #ifdef APP-PLUS
-    let _this = this;
-    plus.runtime.getProperty(plus.runtime.appid, function (inf) {
-      var wgtVer = inf.version;
-      _this.currentVersion = wgtVer;
-    });
-    if (uni.getSystemInfoSync().platform === "android") {
-      this.params.type = 0;
-    } else {
-      this.params.type = 1;
-    }
-    // #endif
-  },
-  methods: {
-    /**
-     * 点击查看更新
-     */
-    async checkUpdate() {
-      // #ifdef APP-PLUS
-      let needUpdate = false;
-      getCurrentNo((res) => {
-        this.currentNo = res.versionCode;
-      });
-      let res = await getAppVersionList(this.params);
-      res.data.data.forEach((ele) => {
-        let versionDetail = ele.version.replace(/\./g, "");
-        if (versionDetail.length < this.currentNo.length) {
-          versionDetail = versionDetail.padEnd(this.currentNo.length, "0");
-        }
-        if (versionDetail > this.currentNo) {
-          needUpdate = true;
-        }
-      });
-      if (needUpdate) {
-        APPUpdate(true);
-      } else {
-        uni.showToast({
-          title: "已是最新版本！",
-        });
-      }
-      // #endif
-    },
-    navigateTo(url) {
-      uni.navigateTo({
-        url,
-      });
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-.box {
-  width: 100%;
-  height: 242rpx;
-  image {
-    transform: scale(2.5);
-    width: 94rpx;
-    height: 94rpx;
-  }
-  view {
-    font-size: 30rpx;
-    margin-top: 25rpx;
-  }
-}
-.u-cell {
-  padding: 35rpx 20rpx;
-  height: 110rpx;
-}
-.intro {
-  color: #999999;
-  font-size: $font-sm;
-  margin-top: 20rpx;
-  border: none;
-  padding: 45rpx 0;
-  line-height: 2em;
-}
-.bottom {
-  :nth-child(1) {
-    color: $main-color;
-    font-size: 22rpx;
-    margin-bottom: 20rpx;
-  }
-  :last-child {
-    font-size: 20rpx;
-    color: $font-color-light;
-  }
-  margin-top: 110rpx;
-}
-</style>

pages/mine/address/add.vue

@@ -149,15 +149,7 @@ export default {
             delete this.form.___path;
             addAddress(this.form).then((res) => {
               if (res.data.success) {
-                if (this.routerVal.type == "order") {
-                  uni.redirectTo({
-                    url: `/pages/mine/address/address?way=${this.routerVal.way}`,
-                  });
-                } else {
-                  uni.redirectTo({
-                    url: `/pages/mine/address/addressManage`,
-                  });
-                }
+                 uni.navigateBack();
               }
             });
           } else {

pages/mine/address/address.vue

@@ -1,7 +1,7 @@
 <template>
   <view class="address">
 
-    <u-empty class="empty" v-if="empty" text="暂无收货地址" mode="address"></u-empty>
+    <u-empty class="empty" v-if="addressList.length == 0" text="暂无收货地址" mode="address"></u-empty>
     <view class="list" v-else>
       <view class="item c-content" v-for="(item, index) in addressList" :key="index">
         <view class="basic" @click="selectAddressData(item)">
@@ -50,7 +50,6 @@ export default {
     return {
       addressList: [], //地址列表
       showAction: false, //是否显示下栏框
-      empty: false, //是否为空
       removeList: [
         {
           text: "确定",
@@ -67,7 +66,11 @@ export default {
       },
     };
   },
-
+  onPullDownRefresh() {
+    //下拉刷新
+    this.addressList = [];
+    this.getAddressList();
+  },
   onLoad: function (val) {
     this.routerVal = val;
   },
@@ -76,19 +79,12 @@ export default {
     this.getAddressList();
   },
   onHide() {},
-  onBackPress(e) {
-    uni.redirectTo({
-      url: "/pages/order/fillorder?way=" + this.routerVal.way,
-    });
-    return true;
-  },
-
   methods: {
     async selectAddressData(val) {
       await API_Trade.setAddressId(val.id, this.routerVal.way);
 
-      uni.redirectTo({
-        url: `/pages/order/fillorder?way=${this.routerVal.way}`,
+      uni.navigateBack({
+        delta: 1,
       });
     },
     //获取地址列表
@@ -99,18 +95,11 @@ export default {
         this.params.pageNumber,
         this.params.pageSize
       ).then((res) => {
-      
-        if (res.data.result.records.length == 0) {
-          this.empty = true;
-        } else {
         res.data.result.records.forEach((item) => {
           item.consigneeAddressPath = item.consigneeAddressPath.split(",");
         });
-
-          this.$set(this, "addressList", res.data.result.records);
-
-         
-        }
+        this.addressList = res.data.result.records;
+        console.log(this.addressList);
 
         uni.hideLoading();
       });
@@ -139,7 +128,6 @@ export default {
     },
     //新建。编辑地址
     addAddress(id) {
- 
       if (id) {
         uni.navigateTo({
           url:
@@ -177,5 +165,5 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import './address.scss';
+@import "./address.scss";
 </style>

pages/mine/address/addressManage.vue

@@ -1,7 +1,7 @@
 <template>
   <view class="address">
-    <u-empty class="empty" v-if="empty" text="暂无收货地址" mode="address"></u-empty>
-    <view class="list" v-else>
+    <u-empty class="empty" v-if="this.addressList == 0" text="暂无收货地址" mode="address"></u-empty>
+    <view class="list" >
       <view class="item c-content" v-for="(item, index) in addressList" :key="index">
         <view class="basic">
           <text>{{ item.name }}</text>
@@ -50,7 +50,7 @@ export default {
     return {
       addressList: [], //地址列表
       showAction: false, //是否显示下栏框
-      empty: false, //是否为空
+  
       removeList: [
         {
           text: "确定",
@@ -77,10 +77,16 @@ export default {
   onLoad: function (val) {
     this.routerVal = val;
   },
+  onPullDownRefresh() {
+    //下拉刷新
+    this.addressList = [];
+    this.getAddressList();
+  },
   /**
    * 进入页面检测当前账户是否登录
    */
   onShow() {
+    let that = this;
     if (this.$options.filters.isLogin("auth")) {
       this.getAddressList();
     } else {
@@ -90,9 +96,7 @@ export default {
         confirmColor: this.$lightColor,
         success: function (res) {
           if (res.confirm) {
-            uni.navigateTo({
-              url: "/pages/passport/login",
-            });
+            that.$options.filters.navigateToLogin();
           } else if (res.cancel) {
             uni.navigateBack();
           }
@@ -108,14 +112,11 @@ export default {
         this.params.pageNumber,
         this.params.pageSize
       ).then((res) => {
-        if (res.data.result.records.length == 0) {
-          this.empty = true;
-        } else {
         res.data.result.records.forEach((item) => {
           item.consigneeAddressPath = item.consigneeAddressPath.split(",");
         });
         this.addressList = res.data.result.records;
-        }
+
         uni.hideLoading();
       });
     },
@@ -169,5 +170,5 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import './address.scss';
+@import "./address.scss";
 </style>

pages/mine/deposit/index.vue

@@ -1,14 +1,17 @@
 <template>
   <view class="wap">
+    <u-navbar back-text="" title="预存款列表">
+    </u-navbar>
     <view class="wrapper-show-money">
       <view class="money-view">
         <h3>预存款金额 </h3>
         <view class="money">￥{{walletNum | unitPrice }}</view>
+
       </view>
     </view>
     <view class="wrapper-tabs">
 
-      <swiper class="swiper-box" @change="changeSwiper" :current="swiperCurrent" @transition="transition" @animationfinish="animationfinish">
+      <swiper class="swiper-box"  :current="swiperCurrent">
         <swiper-item class="swiper-item" v-for="index in list.length" :key="index">
           <scroll-view class="scroll-v view-wrapper" enableBackToTop="true" scroll-with-animation scroll-y @scrolltolower="loadMore">
             <view v-if="datas.length!=0" class="view-item" v-for="(logItem, logIndex) in datas" :key="logIndex">
@@ -37,7 +40,6 @@
 
 <script>
 import { getUserRecharge, getWalletLog } from "@/api/members";
-import storage from "@/utils/storage.js";
 import { getUserWallet } from "@/api/members";
 export default {
   data() {
@@ -77,6 +79,7 @@ export default {
     this.walletNum = result.data.result.memberWallet;
   },
   methods: {
+   
     /**分页获取预存款充值记录 */
     getRecharge() {
       this.status = "loading";
@@ -105,10 +108,7 @@ export default {
       });
     },
 
-    // 点击swiper的时候清空数据
-    changeSwiper() {
-      this.groupBuy = [];
-    },
+  
     changed(index) {
       this.datas = [];
       this.swiperCurrent = index;
@@ -121,19 +121,6 @@ export default {
       }
     },
 
-    // swiper-item左右移动，通知tabs的滑块跟随移动
-    transition({ detail: { dx } }) {
-      this.$refs.tabs.setDx(dx);
-    },
-    // 由于swiper的内部机制问题，快速切换swiper不会触发dx的连续变化，需要在结束时重置状态
-    // swiper滑动结束，分别设置tabs和swiper的状态
-    animationfinish(e) {
-      // this.groupBuy = []
-      let current = e.detail.current;
-      this.$refs.tabs.setFinishCurrent(current);
-      this.swiperCurrent = current;
-      this.current = current;
-    },
     loadMore() {
       this.params.pageNumber++;
       this.getWallet();
@@ -184,9 +171,12 @@ export default {
     margin: 0 auto;
     height: 90rpx;
   }
-.wap {
-}
   
+  .operation {
+    font-size: 32rpx;
+    margin-right: 24rpx;
+    color: rgb(96, 98, 102);
+  }
   .money {
     font-size: 40rpx;
     font-weight: bold;

pages/mine/deposit/operation.vue

@@ -0,0 +1,120 @@
+<template>
+  <div class="wrapper">
+    <u-navbar :custom-back="back" title="余额"></u-navbar>
+    <div class="box">
+      <div class="deposit">预存款金额</div>
+      <div class="money">￥{{walletNum | unitPrice }}</div>
+      <div class="operation-btns">
+        <div class="operation-btn light" @click="navgition('/pages/mine/deposit/withdrawal')">提现</div>
+        <div class="operation-btn" @click="navgition('/pages/mine/deposit/recharge')">充值</div>
+      </div>
+    </div>
+    <div class="box list" @click="navgition('/pages/mine/deposit/index')">
+      <div class="list-left">预存款明细</div>
+      <div class="list-right">
+        <u-icon name="arrow-right"></u-icon>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { getUserWallet } from "@/api/members";
+export default {
+  data() {
+    return {
+      walletNum: 0,
+    };
+  },
+  async onShow() {
+    if (this.$options.filters.isLogin("auth")) {
+      let result = await getUserWallet(); //预存款
+      this.walletNum = result.data.result.memberWallet;
+    } else {
+      uni.showToast({
+        icon: "none",
+        duration: 3000,
+        title: "请先登录！",
+      });
+
+      this.$options.filters.navigateToLogin("redirectTo");
+    }
+  },
+  methods: {
+    back() {
+      uni.switchTab({
+        url: "/pages/tabbar/user/my",
+      });
+    },
+    /**
+     * 跳转
+     */
+    navgition(url) {
+      uni.navigateTo({
+        url,
+      });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.list {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+.list-left {
+  flex: 8;
+}
+.list-right {
+  flex: 2;
+  text-align: right;
+}
+.wrapper {
+  width: 94%;
+  margin: 0 3%;
+}
+.box {
+  margin: 20rpx 0;
+  background: #fff;
+  border-radius: 20rpx;
+
+  padding: 40rpx;
+}
+.operation-btns {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+.money {
+  text-align: center;
+  color: #333;
+  font-size: 50rpx;
+  margin: 20rpx 0 40rpx 0;
+  letter-spacing: 2rpx;
+}
+.deposit {
+  margin-top: 50rpx;
+  text-align: center;
+  color: #999;
+  font-size: 28rpx;
+
+  letter-spacing: 2rpx;
+}
+.operation-btn {
+  background: #ee6d41;
+  color: #fff;
+  height: 90rpx;
+  width: 240rpx;
+  margin: 0 20rpx;
+  border-radius: 10rpx;
+  text-align: center;
+  line-height: 90rpx;
+  font-size: 32rpx;
+}
+.light {
+  background: #fdf2ee;
+  color: #ee6d41;
+}
+</style>

pages/mine/deposit/recharge.vue

@@ -0,0 +1,50 @@
+<template>
+  <view>
+    <view class="-list">
+      <view class="title">充值金额</view>
+      <view class="content">
+        <view class="price">
+          <span> ￥</span>
+          <u-input v-model="price" placeholder="" type="number" />
+        </view>
+
+      </view>
+    </view>
+
+    <view class="submit" :class="{'light':flag}" @click="handlerRecharge">充值</view>
+  </view>
+</template>
+<script>
+import { recharge } from "@/api/members";
+export default {
+  data() {
+    return {
+      price: 0,
+      flag: true,
+    };
+  },
+  watch: {
+    price(val) {
+      val <= 0 ? (this.flag = true) : (this.flag = false);
+    },
+  },
+  mounted() {},
+  methods: {
+    // 充值
+    async handlerRecharge() {
+      if (this.price > 0) {
+       
+        let res = await recharge({ price: this.price });
+        if (res.data.success) {
+          uni.navigateTo({
+            url: `/pages/cart/payment/payOrder?orderType=RECHARGE&recharge_sn=${res.data.result.rechargeSn}`,
+          });
+        }
+      }
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+@import './style.scss';
+</style>

pages/mine/deposit/style.scss

@@ -0,0 +1,46 @@
+/deep/ .u-input__input,
+.u-input {
+  font-size: 80rpx !important;
+  height: 102rpx !important;
+}
+/deep/ .u-input__input {
+  height: 100%;
+  font-size: 80rpx;
+}
+.content {
+  display: flex;
+  > .price {
+    width: 60%;
+    margin: 20rpx 0;
+    font-size: 80rpx;
+    display: flex;
+  }
+  > .all {
+    justify-content: center;
+    width: 40%;
+    display: flex;
+    flex-direction: column;
+    align-items: flex-end;
+  }
+}
+.-list {
+  margin: 20rpx 0;
+  background: #fff;
+  padding: 16rpx 32rpx;
+}
+.title {
+  font-size: 35rpx;
+}
+.light {
+  opacity: 0.6;
+}
+.submit {
+  margin: 80rpx auto;
+  width: 94%;
+  background: $light-color;
+  height: 90rpx;
+  color: #fff;
+  border-radius: 10rpx;
+  text-align: center;
+  line-height: 90rpx;
+}

pages/mine/deposit/withdrawal.vue

@@ -0,0 +1,78 @@
+<template>
+  <view>
+    <view class="-list">
+      <view class="title">提现金额</view>
+      <view class="content">
+        <view class="price">
+          <span> ￥</span>
+          <u-input v-model="price" placeholder="" type="number" />
+        </view>
+
+        <view class="all">
+          <view @click="handleAll" :style="{ color: $mainColor }">全部</view>
+          <view style="font-size: 24rpx; color: #999">可提现金额<span>{{ walletNum | unitPrice }}</span>元</view>
+        </view>
+
+      </view>
+      <view class="tips">
+        最低提现金额为1.00元
+      </view>
+    </view>
+
+    <view class="submit" @click="cashd">提现</view>
+  </view>
+</template>
+<script>
+import { getUserWallet, withdrawalApply } from "@/api/members";
+export default {
+  data() {
+    return {
+      price: 0,
+      walletNum: 0,
+    };
+  },
+  async mounted() {
+    let result = await getUserWallet(); //预存款
+    this.walletNum = result.data.result.memberWallet;
+  },
+
+  methods: {
+    cashd() {
+      this.price = this.price + "";
+
+      if (this.$u.test.amount(parseInt(this.price))) {
+        withdrawalApply({ price: this.price }).then((res) => {
+          if (res.data.success) {
+            uni.showToast({
+              title: "提现成功!",
+              duration: 2000,
+              icon: "none",
+            });
+            setTimeout(() => {
+              uni.navigateBack({
+                delta: 1,
+              });
+            }, 1000);
+          }
+        });
+      } else {
+        uni.showToast({
+          title: "请输入正确金额",
+          duration: 2000,
+          icon: "none",
+        });
+      }
+    },
+    handleAll() {
+      this.price = this.walletNum;
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+@import "./style.scss";
+.tips {
+  font-size: 24rpx;
+  color: #999;
+}
+</style>

pages/mine/distribution/auth.vue

@@ -8,10 +8,16 @@
             <u-input v-model="ruleForm.name" placeholder="请输入您的真实姓名" />
           </u-form-item>
           <u-form-item label="身份证" prop="idNumber">
-            <u-input
-              v-model="ruleForm.idNumber"
-              placeholder="请输入身份证号码"
-            />
+            <u-input v-model="ruleForm.idNumber" placeholder="请输入身份证号码" />
+          </u-form-item>
+          <u-form-item label="银行开户行" prop="settlementBankBranchName">
+            <u-input v-model="ruleForm.settlementBankBranchName" type="text" placeholder="请输入银行开户行" />
+          </u-form-item>
+          <u-form-item label="银行开户名" prop="settlementBankAccountName">
+            <u-input v-model="ruleForm.settlementBankAccountName" type="text" placeholder="请输入银行开户名" />
+          </u-form-item>
+          <u-form-item label="银行账号" prop="settlementBankAccountNum">
+            <u-input v-model="ruleForm.settlementBankAccountNum" type="text" placeholder="请输入银行账号" />
           </u-form-item>
           <!-- <u-form-item label="身份证正面照" prop="name">
             <u-upload></u-upload>
@@ -35,12 +41,16 @@
 </template>
 <script>
 import { applyDistribution } from "@/api/goods";
+import { checkBankno } from "@/utils/Foundation";
 export default {
   data() {
     return {
       ruleForm: {
         name: "",
         idNumber: "",
+        settlementBankBranchName: "", // 银行开户行
+        settlementBankAccountName: "", //银行开户名
+        settlementBankAccountNum: "", //银行账号
       },
       rules: {
         name: [
@@ -62,6 +72,50 @@ export default {
             trigger: ["change", "blur"],
           },
         ],
+        // 银行开户行
+        settlementBankBranchName: [
+          {
+            required: true,
+            message: "银行开户行",
+            // 可以单个或者同时写两个触发验证方式
+            trigger: "blur",
+          },
+          {
+            validator: (rule, value, callback) => {
+              // 上面有说，返回true表示校验通过，返回false表示不通过
+              // this.$u.test.mobile()就是返回true或者false的
+              return this.$u.test.chinese(value);
+            },
+            message: "银行开户行不正确",
+            // 触发器可以同时用blur和change
+            trigger: ["change", "blur"],
+          },
+        ], //银行开户名
+        settlementBankAccountName: [
+          {
+            required: true,
+            message: "银行开户名",
+            // 可以单个或者同时写两个触发验证方式
+            trigger: "blur",
+          },
+        ],
+        //银行账号
+        settlementBankAccountNum: [
+          {
+            required: true,
+            message: "银行账号不正确",
+            // 可以单个或者同时写两个触发验证方式
+            trigger: "blur",
+          },
+          {
+            validator: (rule, value, callback) => {
+              // 上面有说，返回true表示校验通过，返回false表示不通过
+              // this.$u.test.mobile()就是返回true或者false的
+              return checkBankno(value);
+            },
+            message: "银行账号不正确",
+          },
+        ],
         idNumber: [
           {
             required: true,
@@ -98,14 +152,12 @@ export default {
 
               setTimeout(() => {
                 uni.navigateBack();
-              },500)
-             
-            }
-            else{
+              }, 500);
+            } else {
               uni.showToast({
                 title: res.data.message,
                 duration: 2000,
-                icon:"none"
+                icon: "none",
               });
             }
           });

pages/mine/distribution/history.vue

@@ -1,6 +1,7 @@
 <template>
   <view class="log-list">
-    <view class="log-way" v-for="(item, index) in datas" :key="index">
+    <!-- 提现记录 -->
+    <view class="log-way" v-if="cashLogData.length != 0" v-for="(item, index) in cashLogData" :key="index">
       <view class="log-item">
         <view class="log-item-view">
           <view class="title">{{
@@ -18,10 +19,22 @@
         </view>
       </view>
     </view>
+    <!-- 分销业绩 -->
+    <view class="log-way" v-if="achievementData.length != 0" v-for="(item, index) in achievementData" :key="index">
+      <view class="log-item">
+        <view class="log-item-view">
+          <view class="title">{{item.goodsName}}</view>
+          <view class="price">+{{ item.rebate | unitPrice }}</view>
+        </view>
+        <view class="log-item-view">
+          <view>{{ item.createTime }}</view>
+          <view>{{item.storeName}}</view>
+        </view>
+      </view>
+    </view>
     <view class="empty" v-if="empty">
       <u-loadmore :status="status" :icon-type="iconType" bg-color="#f7f7f7" />
 
-      <!-- <u-empty   text="暂无更多提现历史" mode="order"></u-empty> -->
     </view>
   </view>
 </template>
@@ -30,7 +43,8 @@ import { cashLog, distributionOrderList } from "@/api/goods";
 export default {
   data() {
     return {
-      datas: "", //数据集合
+      cashLogData: [], //提现记录数据集合
+      achievementData: [], //分销业绩数据合集,
       status: "loadmore",
       iconType: "flower",
       empty: false,
@@ -42,9 +56,6 @@ export default {
       type: 0,
       routers: "",
       achParams: {
-        distributionId: (this.routers && this.routers.id) || "", //分销商id
-        distributionName: (this.routers && this.routers.name) || "", //分销商名称
-        distributionOrderStatus: "", //分销商订单状态
         pageNumber: 1,
         pageSize: 10,
       },
@@ -58,20 +69,30 @@ export default {
       title: title, //这是修改后的导航栏文字
     });
     this.routers = option;
-
+    this.type = option.type;
     option.type == 0 ? this.achievement() : this.history();
   },
   mounted() {},
   onReachBottom() {
     this.status = "loading";
-    this.params.pageNumber++;
-
-    this.type == 1 ? this.history() : this.achievement();
+    this.type == 0 ? this.achParams.pageNumber++ : this.params.pageNumber++;
+    this.type == 0 ? this.achievement() : this.history();
   },
   methods: {
     // 业绩
     achievement() {
-      distributionOrderList(this.achParams).then((res) => {});
+      uni.showLoading({
+        title: "加载中",
+      });
+      distributionOrderList(this.achParams).then((res) => {
+        if (res.data.success && res.data.result.records.length >= 1) {
+          this.achievementData = res.data.result.records;
+        } else {
+          this.status = "nomore";
+          this.empty = true;
+        }
+        uni.hideLoading();
+      });
     },
     // 初始化提现历史
     history() {
@@ -80,7 +101,7 @@ export default {
       });
       cashLog(this.params).then((res) => {
         if (res.data.success && res.data.result.records.length >= 1) {
-          this.datas = res.data.result.records;
+          this.cashLogData = res.data.result.records;
         } else {
           this.status = "nomore";
           this.empty = true;

pages/mine/distribution/home.vue

@@ -40,10 +40,7 @@
         <view>提现</view>
       </view>
   
-      <view class="nav-item" @click="handleClick('/pages/mine/distribution/list')">
-        <u-icon size="50" color="#1e9ff2" name="home-fill"></u-icon>
-        <view>选品库</view>
-      </view>
+     
     </view>
 
   </view>
@@ -85,7 +82,7 @@ export default {
       });
     },
   },
-  mounted() {
+  onShow() {
     this.init();
   },
 };
@@ -93,21 +90,15 @@ export default {
 
 <style lang="scss" scoped>
 .nav {
-  //   height: 176rpx;
   background: #fff;
   align-items: center;
   display: flex;
-  //   border-radius: 20rpx;
-  //   transform: translateY(-20rpx);
-  //   box-shadow: 4rpx 10rpx 22rpx rgba(0, 0, 0, 0.1);
   flex-wrap: wrap;
 }
 .nav-list {
   color: #fff;
   padding: 40rpx 0;
   background: $aider-light-color;
-  //   border-bottom-left-radius: 100rpx;
-  //   border-bottom-right-radius: 100rpx;
 }
 .total {
   padding: 10rpx 0;

pages/mine/distribution/list.vue

@@ -1,7 +1,7 @@
 <template>
   <view class="wrapper">
-    <!-- 筛选弹出层 -->
-    <u-popup width="90%" v-model="popup" mode="right">
+    <!-- 筛选弹出层 TODO后续版本更新 -->
+    <!-- <u-popup width="90%" v-model="popup" mode="right">
       <view class="screen-title">商品筛选</view>
 
       <view class="screen-view">
@@ -54,7 +54,7 @@
         <view class="screen-clear"> 重置 </view>
         <view class="screen-submit"> 确定 </view>
       </view>
-    </u-popup>
+    </u-popup> -->
 
     <!-- 导航栏 -->
     <view class="nav">
@@ -66,7 +66,10 @@
     <!-- 商品列表 -->
 
     <view class="goods-list">
-      <view class="goods-item" v-for="(item, index) in goodsList" :key="index">
+      <u-swipe-action v-for="(item, index) in goodsList" :disabled="!params.checked" :show="item.___selected" @open="openAction(item)" :index="index" :options="options" bg-color="#fff"
+        ref="swiperAction" :key="item.id" @click="changeActionTab(item)">
+
+        <div class="goods-item">
           <view class="goods-item-img" @click="handleNavgationGoods(item)">
             <u-image width="176rpx" height="176rpx" :src="item.thumbnail"></u-image>
           </view>
@@ -97,13 +100,16 @@
               </view>
             </view>
           </view>
-      </view>
+        </div>
+      </u-swipe-action>
+
       <view class="empty">
         <!-- <u-empty v-if="empty" text="没有分销商品了" mode="list"></u-empty> -->
       </view>
     </view>
     <canvas class="canvas-hide" canvas-id="qrcode" />
     <drawCanvas ref="drawCanvas" v-if="showFlag" :res="res" />
+    <u-modal v-model="deleteShow" :confirm-style="{'color':lightColor}" @confirm="delectConfirm" show-cancel-button :content="deleteContent" :async-close="true"></u-modal>
 
   </view>
 </template>
@@ -118,6 +124,17 @@ import drawCanvas from "@/components/m-canvas";
 export default {
   data() {
     return {
+      lightColor: this.$lightColor,
+      deleteContent: "解绑该商品？", //删除显示的信息
+      // 商品栏右侧滑动按钮
+      options: [
+        {
+          text: "解绑",
+          style: {
+            backgroundColor: this.$lightColor, //高亮颜色
+          },
+        },
+      ],
       showFlag: false, //分销分享开关
       empty: false,
       popup: false, //弹出层开关
@@ -147,6 +164,8 @@ export default {
       },
 
       routers: "",
+      deleteShow: false, //删除模态框
+      goodsVal: false, //分销商铺信息
     };
   },
   components: {
@@ -155,31 +174,75 @@ export default {
   onLoad(options) {
     this.routers = options;
   },
-  watch: {
-    showFlag(val) {
-   
-    },
-  },
+  watch: {},
   onShow() {
     this.goodsList = [];
     this.init();
   },
   methods: {
+    /**
+     * 滑动删除
+     */
+    changeActionTab(val) {
+      this.deleteShow = true;
+      this.goodsVal = val;
+    },
+
+    /**
+     * 点击解绑商品
+     */
+    delectConfirm() {
+      checkedDistributionGoods({ id: this.goodsVal.id, checked: false }).then(
+        (res) => {
+          if (res.data.success) {
+            uni.showToast({
+              title: "此商品解绑成功",
+              duration: 2000,
+            });
+            this.deleteShow = false;
+            this.goodsList = [];
+            this.init();
+          }
+        }
+      );
+    },
+
+    /**
+     * 左滑打开删除
+     */
+    openAction(val) {
+      this.goodsList.forEach((item) => {
+        this.$set(item, "___selected", false);
+      });
+      this.$set(val, "___selected", true);
+    },
+
+    /**
+     * 查看图片
+     */
     handleNavgationGoods(val) {
       uni.navigateTo({
-        url: `/pages/product/goods?id=${val.skuId}&goodsId=${val.id}`,
+        url: `/pages/product/goods?id=${val.skuId}&goodsId=${val.goodsId}`,
       });
     },
 
     async handleLink(goods) {
+      uni.showToast({
+        title: "请请按住保存图片",
+        duration: 2000,
+        icon: "none",
+      });
       let page = `pages/product/goods`;
-      let scene = `${goods.skuId},${goods.id},${this.routers.id}`;
+      let scene = `${goods.skuId},${goods.goodsId},${this.routers.id}`;
       let result = await getMpCode({ page, scene });
       if (result.data.success) {
         let callback = result.data.result;
         this.res.container.title = `${goods.goodsName}`;
         this.res.bottom.code = `data:image/png;base64,${callback}`;
-      this.res.bottom.price = this.$options.filters.unitPrice(goods.price, "￥");
+        this.res.bottom.price = this.$options.filters.unitPrice(
+          goods.price,
+          "￥"
+        );
         this.res.bottom.desc = `${goods.goodsName}`;
         this.res.bottom.img = `${goods.thumbnail}`;
 
@@ -187,12 +250,11 @@ export default {
           this.$refs.drawCanvas.init();
         }
         this.showFlag = true;
-      }
-      else{
+      } else {
         uni.showToast({
           title: `制作二维码失败！请稍后重试`,
           duration: 2000,
-          icon:"none"
+          icon: "none",
         });
       }
     },
@@ -209,12 +271,7 @@ export default {
 
     // 选择商品
     handleClickGoods(val) {
-      uni.showLoading({
-        title: "加载中",
-        mask: true,
-      });
-      checkedDistributionGoods(val.id).then((res) => {
-        uni.hideLoading();
+      checkedDistributionGoods({ id: val.id, checked: true }).then((res) => {
         if (res.data.success) {
           uni.showToast({
             title: "已添加到我的选品库",
@@ -231,13 +288,11 @@ export default {
     },
 
     init() {
-      uni.showLoading({
-        title: "加载中",
-      });
       distributionGoods(this.params).then((res) => {
-        uni.hideLoading();
-
         if (res.data.success && res.data.result.records.length >= 1) {
+          res.data.result.records.forEach((item) => {
+            this.$set(item, "___selected", false);
+          });
           this.goodsList.push(...res.data.result.records);
         }
         if (this.goodsList.length == 0) {
@@ -399,7 +454,7 @@ export default {
       overflow: hidden;
     }
     > .-item-price {
-      color: $jd-color;
+      color: $price-color;
       > span {
         font-size: 36rpx;
       }

pages/mine/help/tips.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="wrapper">
-    <div v-html="res.content"></div>
+    <u-parse v-html="res.content"></u-parse>
 
   </div>
 </template>

pages/mine/msgTips/packageMsg/logisticsDetail.vue

@@ -30,11 +30,8 @@
 </template>
 
 <script>
-import uniSteps from "@/components/uni-steps/uni-steps.vue";
 import { getExpress } from "@/api/trade.js";
-
 export default {
-  components: { uniSteps },
   data() {
     return {
       express: "",

pages/mine/myCollect.vue

@@ -11,10 +11,11 @@
       <view v-if="tabCurrentIndex == 0" class="tab-content">
         <scroll-view class="list-scroll-content" scroll-y @scrolltolower="loadMore">
           <!-- 空白页 -->
-          <u-empty text="暂无收藏商品数据" mode="favor" v-if="goodsEmpty"></u-empty>
+          <u-empty style="margin-top:40rpx;" text="暂无收藏商品数据" mode="favor" v-if="goodsEmpty"></u-empty>
           <!-- 商品展示数据 -->
-          <u-swipe-action @open="openLeftChange(item,index,'goods')" :show="item.selected" btn-width="180" :options="LeftOptions" v-else v-for="(item,index) in goodList"
-            @click="clickGoodsSwiperAction(item,index)" :index="index" :key="index">
+          <u-swipe-action @open="openLeftChange(item,index,'goods')" :show="item.selected" btn-width="180"
+            :options="LeftOptions" v-else v-for="(item,index) in goodList" @click="clickGoodsSwiperAction(item,index)"
+            :index="index" :key="index">
             <view class="goods" @click="goGoodsDetail(item)">
               <u-image width="131rpx" height="131rpx" :src="item.image" mode="aspectFit">
                 <u-loading slot="loading"></u-loading>
@@ -34,20 +35,22 @@
       <view v-else class="tab-content">
         <scroll-view class="list-scroll-content" scroll-y @scrolltolower="loadMore">
           <!-- 空白页 -->
-          <u-empty text="暂无收藏店铺数据" mode="favor" v-if="storeEmpty"></u-empty>
+          <u-empty style="margin-top:40rpx;" text="暂无收藏店铺数据" mode="favor" v-if="storeEmpty"></u-empty>
           <!-- 店铺展示数据 -->
-          <u-swipe-action @open="openLeftChange(item,'store')" :show="item.selected" btn-width="180" :options="LeftOptions" v-else v-for="(item,index) in storeList" :key="index"
+          <u-swipe-action @open="openLeftChange(item,'store')" :show="item.selected" btn-width="180"
+            :options="LeftOptions" v-else v-for="(item,index) in storeList" :key="index"
             @click="clickstoreSwiperAction(item)">
-            <view class="store" @click="gostoreMainPage(item.storeId)">
+            <view class="store" @click="gostoreMainPage(item.id)">
               <view class="intro">
                 <view class="store-logo">
-                  <u-image width="102rpx" height="102rpx" :src="item.logo" :alt="item.storeName" mode="aspectFit">
+                  <u-image width="102rpx" height="102rpx" :src="item.storeLogo" :alt="item.storeName" mode="aspectFit">
                     <u-loading slot="loading"></u-loading>
                   </u-image>
                 </view>
                 <view class="store-name">
                   <view>{{item.storeName}}</view>
-                  <u-tag size="mini" type="error" :color="$mainColor" v-if="item.selfOperated" text="自营" mode="plain" shape="circle" />
+                  <u-tag size="mini" type="error" :color="$mainColor" v-if="item.selfOperated" text="自营" mode="plain"
+                    shape="circle" />
                 </view>
                 <view class="store-collect">
                   <view>进店逛逛</view>
@@ -133,7 +136,6 @@ export default {
      */
     clickGoodsSwiperAction(val) {
       deleteGoodsCollection(val.skuId).then((res) => {
-      
         if (res.statusCode == 200) {
           this.storeList = [];
           this.goodList = [];
@@ -159,7 +161,6 @@ export default {
      */
     tabClick(index) {
       this.tabCurrentIndex = index;
-  
     },
 
     /**

pages/mine/myTracks.vue

@@ -1,7 +1,8 @@
 <template>
   <view class="myTracks">
-    <empty v-if="whetherEmpty"></empty>
-    <view v-else v-for="(item, index) in trackList" :key="index">
+    <u-empty text="暂无历史记录" style="margin-top:200rpx;" mode="history" v-if="whetherEmpty"></u-empty>
+    <div v-else>
+      <view  v-for="(item, index) in trackList" :key="index">
         <view class="myTracks-title" @click="navgaiteToStore(item)">{{item.storeName}}</view>
         <view class="myTracks-items">
           <view class="myTracks-item">
@@ -23,8 +24,10 @@
           </view>
         </view>
         <view class="myTracks-divider"></view>
+
       </view>
       <uni-load-more :status="loadStatus"></uni-load-more>
+    </div>
     <view v-if="editFlag">
       <view class="myTracks-action-placeholder"></view>
       <view class="myTracks-action">

pages/mine/point/myPoint.vue

@@ -4,7 +4,7 @@
       <image src="/static/pointTrade/point_bg_1.png" mode=""></image>
       <image class="point-img" src="/static/pointTrade/tradehall.png" />
       <view class="position-point">
-        <view class="apply-point" @click="goIntro"><text>积分介绍</text></view>
+       
 
       </view>
     </view>
@@ -25,7 +25,7 @@
           <view>{{ item.content }}</view>
           <view>{{ item.createTime}}</view>
         </view>
-        <view><span>{{item.pointType == "1" ? '+' : '-'}}</span>{{ item.variablePoint }}</view>
+        <view><span>{{item.pointType == "INCREASE" ? '+' : '-'}}</span>{{ item.variablePoint }}</view>
       </view>
       <uni-load-more :status="count.loadStatus"></uni-load-more>
     </div>

pages/mine/set/editionIntro.vue

@@ -1,122 +1,160 @@
-// TODO 第一版本暂无此功能 后续优化以及更新
+
 <template>
   <view class="edition-intro">
-    <view class="logo c-content">
+    <image :src="config.logo" class="logo" />
+    <h1> {{config.name}}</h1>
+    <view class='version'>
+      <!-- #ifdef APP-PLUS -->
+      Version {{localVersion.version}}
+      <!-- #endif -->
+    </view>
+
+    <!-- {{localVersion}} -->
+    <u-cell-group class="cell" :border="false">
+      <!--  #ifdef APP-PLUS -->
+      <u-cell-item v-if="IosWhether" @click="checkStar" title="去评分"></u-cell-item>
+      <u-cell-item title="功能介绍" @click="navigateTo('/pages/mine/set/versionFunctionList')"></u-cell-item>
+      <u-cell-item title="检查更新" @click="checkUpdate"></u-cell-item>
+      <!--  #endif -->
+      <u-cell-item title="证照信息" @click="navigateTo('/pages/mine/help/tips?type=message')"></u-cell-item>
+      <u-cell-item title="服务协议" @click="navigateTo('/pages/mine/help/tips?type=user')"></u-cell-item>
+      <u-cell-item title="隐私协议" @click="navigateTo('/pages/mine/help/tips?type=privacy')"></u-cell-item>
+      <u-cell-item title="关于我们" :border-bottom="false" @click="navigateTo('/pages/mine/help/tips?type=about')"></u-cell-item>
+
+    </u-cell-group>
+
+    <view class="intro">
+      <view>{{config.customerServiceMobile ? `客服热线：${config.customerServiceMobile}` :  ``}}</view>
+      <view style="margin:20rpx 0 0 0;">{{config.customerServiceEmail ? `客服邮箱：${config.customerServiceEmail}` :  ``}}</view>
+
       <view>
-        <image src="/static/img/edition.png" mode=""></image>
+        <view style="margin:20rpx 0; color:#003a8c;" @click="navigateTo('/pages/mine/help/tips?type=user')">《{{config.name}}用户协议》</view>
+        <view>CopyRight @{{config.name}} </view>
       </view>
-      <view>版本不息&nbsp;优化不止</view>
-    </view>
-    <view class="edition c-content" v-for="(item,index) in editionHistory" :key="index">
-      <view class="level">
-        <text style="color: #1ABC9C;">{{item.version}}</text>
-        <text>{{$u.timeFormat(item.update_time, 'yyyy-mm-dd')}}</text>
-      </view>
-      <view class="detail" v-html="item.content"></view>
     </view>
   </view>
 </template>
 
 <script>
-import * as API_Message from "@/api/message.js";
+import APPUpdate from "@/plugins/APPUpdate";
+import config from "@/config/config";
+import { getAppVersion } from "@/api/message.js";
 export default {
   data() {
     return {
+      config,
+      IosWhether: false, //是否是ios
       editionHistory: [], //版本历史
+      versionData: {}, //版本信息
+      localVersion: "", //当前版本信息
       params: {
         pageNumber: 1,
         pageSize: 5,
       },
-      loadStatus: "more",
     };
   },
   onLoad() {
-    if (uni.getSystemInfoSync().platform === "android") {
+    // #ifdef APP-PLUS
+    const platform = uni.getSystemInfoSync().platform;
+    /**
+     * 获取是否是安卓
+     */
+    if (platform === "android") {
       this.params.type = 0;
     } else {
+      this.IosWhether = true;
       this.params.type = 1;
     }
-    this.GET_AppVersionList(true);
-  },
-  onReachBottom() {
-    if (this.loadStatus != "noMore") {
-      this.params.pageNumber++;
-      this.GET_AppVersionList(false);
-    }
+    this.getVersion(platform);
+
+    plus.runtime.getProperty(plus.runtime.appid, (inf) => {
+      this.localVersion = {
+        versionCode: inf.version.replace(/\./g, ""),
+        version: inf.version,
+      };
+    });
+    // #endif
   },
+
   methods: {
-    GET_AppVersionList(reset) {
-      if (reset) {
-        this.params.pageNumber = 1;
+    async getVersion(platform) {
+      let type;
+      platform == "android" ? (type = "ANDROID") : (type = "IOS");
+
+      let res = await getAppVersion(type);
+      if (res.data.success) {
+        this.versionData = res.data.result;
       }
-      uni.showLoading({
-        title: "加载中",
+    },
+
+    navigateTo(url) {
+      uni.navigateTo({
+        url,
       });
-      API_Message.getAppVersionList(this.params).then((response) => {
-        uni.hideLoading();
-        if (response.statusCode == 200) {
-          const { data } = response;
-          if (data.data.length < 10) {
-            this.loadStatus = "noMore";
-          }
-          this.editionHistory.push(...data.data);
-        }
+    },
+
+    /**
+     * ios点击评分
+     */
+    checkStar() {
+      plus.runtime.launchApplication({
+        action: `itms-apps://itunes.apple.com/app/${config.iosAppId}?action=write-review`,
       });
     },
+
+    /**
+     * 检查更新
+     */
+    checkUpdate() {
+      if (
+        this.versionData.version.replace(/\./g, "") <
+        this.localVersion.versionCode
+      ) {
+        APPUpdate();
+      } else {
+        uni.showToast({
+          title: "当前版本已是最新版",
+          duration: 2000,
+          icon: "none",
+        });
+      }
+    },
   },
 };
 </script>
 
 <style lang="scss" scoped>
+page {
+  background: #fff !important;
+}
+.cell {
+  width: 90%;
+  margin: 0 auto;
+}
 .edition-intro {
-  .logo {
+  min-height: 100vh;
+  background: #fff;
   display: flex;
+  flex-direction: column;
   justify-content: center;
   align-items: center;
-    flex-direction: column;
-    font-size: $font-lg;
-    color: $font-color-light;
-    height: 330rpx;
-    margin-bottom: 20rpx;
-    > view:nth-child(1) {
-      width: 144rpx;
-      height: 144rpx;
-      border: 1px solid #ffc71c;
-      border-radius: 50%;
-      position: relative;
-      margin-bottom: 30rpx;
-      image {
-        width: 80rpx;
-        height: 113rpx;
-        position: absolute;
-        top: 0;
-        left: 0;
-        right: 0;
-        bottom: 0;
-        margin: auto;
+
+  > h1 {
+    margin: 20rpx 0 20rpx 0;
+    letter-spacing: 2rpx;
+  }
+  > .version {
+    font-size: 30rpx;
+    margin-bottom: 100rpx;
   }
 }
+.intro {
+  margin-top: 100rpx;
+  font-size: 24rpx;
+  letter-spacing: 2rpx;
 }
-  .edition {
-    margin-bottom: 20rpx;
-    color: $font-color-light;
-    font-size: $font-sm;
-    .level {
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-      padding: 20rpx 30rpx;
-      border-bottom: 2rpx solid $border-color-light;
-      text:nth-child(1) {
-        font-size: $font-base;
-        font-weight: 700;
-      }
-    }
-    .detail {
-      margin-left: 20rpx;
-      line-height: 2em;
-      padding: 20rpx 0;
-    }
-  }
+.logo {
+  width: 200rpx;
+  height: 200rpx;
 }
 </style>

pages/mine/set/notify.vue

@@ -1,39 +0,0 @@
-<template>
-	<view class="notify">
-		<u-cell-group>
-			<u-cell-item  title="账户通知" :arrow="false">
-				<u-switch slot="right-icon" active-color="#1abc9c" size="40" v-model="setting.account"></u-switch>
-			</u-cell-item>
-			<u-cell-item  title="物流通知" :arrow="false">
-				<u-switch slot="right-icon" active-color="#1abc9c" size="40" v-model="setting.logistics"></u-switch>
-			</u-cell-item>
-			<u-cell-item  title="优惠促销" :arrow="false">
-				<u-switch slot="right-icon" active-color="#1abc9c" size="40"  v-model="setting.cheap"></u-switch>
-			</u-cell-item>
-			<u-cell-item  title="服务通知" :arrow="false">
-				<u-switch slot="right-icon" active-color="#1abc9c" size="40"  v-model="setting.service"></u-switch>
-			</u-cell-item>
-		</u-cell-group>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				setting:{
-					account:false,
-					logistics:false,
-					cheap:false,
-					service:false
-				}
-			};
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-uni-view{
-	font-size: 20rpx;
-}
-</style>

pages/mine/set/personMsg.vue

@@ -98,23 +98,14 @@ export default {
      * 提交保存
      */
     submit() {
-      if (this.form.regionId.length != 0 && this.birthday) {
       delete this.form.___path;
       let params = JSON.parse(JSON.stringify(this.form));
       saveUserInfo(params).then((res) => {
-       
         if (res.statusCode == 200) {
           storage.setUserInfo(res.data.result);
           uni.navigateBack();
         }
       });
-      } else {
-        uni.showToast({
-          title: "请填写生日和城市!",
-          duration: 2000,
-          icon: "none",
-        });
-      }
     },
 
     /**

pages/mine/set/securityCenter/editPassword.vue

@@ -9,7 +9,7 @@
     <u-form :model="codeForm" class="form" ref="validateCodeForm">
       <view v-if="!validateFlage">
         <u-form-item label-width="120" label="手机号" prop="mobile">
-          <u-input v-model="codeForm.mobile" placeholder="请输入您的手机号" />
+          <u-input maxlength="11" v-model="codeForm.mobile" placeholder="请输入您的手机号" />
         </u-form-item>
 
         <u-form-item class="sendCode" label-width="120" prop="code" label="验证码">
@@ -19,7 +19,7 @@
         </u-form-item>
 
         <view class="submit" @click="validatePhone">验证</view>
-        <myVerification keep-running @send="verification" class="verification" ref="verification" business="LOGIN" />
+        <myVerification keep-running @send="verification" class="verification" ref="verification" business="FIND_USER" />
       </view>
       <view v-if="validateFlage">
         <u-form-item label-width="120" label="旧密码">
@@ -40,7 +40,7 @@
 
 <script>
 import { sendMobile, resetByMobile, modifyPass } from "@/api/login";
-import storage from "@/utils/storage.js";
+
 import { md5 } from "@/utils/md5.js"; // md5
 import myVerification from "@/components/verification/verification.vue"; //验证
 import uuid from "@/utils/uuid.modified.js";
@@ -108,7 +108,7 @@ export default {
           uni.showLoading({
             title: "正在获取验证码",
           });
-          sendMobile(this.codeForm.mobile).then((res) => {
+          sendMobile(this.codeForm.mobile, "FIND_USER").then((res) => {
             uni.hideLoading();
             // 这里此提示会被this.start()方法中的提示覆盖
             if (res.data.code == 200) {
@@ -161,8 +161,7 @@ export default {
         if (valid) {
           resetByMobile(this.codeForm).then((res) => {
             if (res.data.success) {
-              storage.setAccessToken(res.data.result.accessToken);
-              storage.setRefreshToken(res.data.result.refreshToken);
+              this.validateFlage = !this.validateFlage;
               // 登录成功
               uni.showToast({
                 title: "验证成功!",
@@ -238,6 +237,9 @@ page {
   padding: 80rpx 0;
   border-radius: 20rpx;
 }
+.submit {
+  background: $light-color;
+}
 .box-tips {
   margin: 0 72rpx;
 }

pages/mine/set/securityCenter/securityCenter.vue

@@ -17,13 +17,10 @@ export default {
   methods: {
     navigateTo(url) {
       uni.navigateTo({
-        url: url + `?mobile=${this.mobile}`,
+        url: url,
       });
     },
   },
-  onLoad(option) {
-    this.mobile = option.mobile;
-  },
 };
 </script>
 

pages/mine/set/setUp.vue

@@ -3,7 +3,8 @@
     <view class="person" @click="checkUserInfo()">
       <u-image width=140 height="140" shape="circle" :src="userInfo.face || '/static/missing-face.png'" mode=""></u-image>
       <view class="user-name">
-        <view>{{ userInfo.id ? userInfo.username || '' : '暂未登录'  }}</view>
+
+        {{ userInfo.id ? userInfo.nickName || '' : '暂未登录'  }}
       </view>
       <u-icon color="#ccc" name="arrow-right"></u-icon>
     </view>
@@ -17,10 +18,8 @@
       <u-cell-item title="安全中心" @click="navigateTo('/pages/mine/set/securityCenter/securityCenter')"></u-cell-item>
       <u-cell-item title="意见反馈" @click="navigateTo('/pages/mine/set/feedBack')"></u-cell-item>
       <!-- #ifndef H5 -->
-      <u-cell-item title="版本说明" @click="navigateTo('/pages/mine/set/editionIntro')"></u-cell-item>
       <!-- #endif -->
-      <!-- <u-cell-item title="好评鼓励"></u-cell-item> -->
-      <u-cell-item title="关于我们" @click="navigateTo('/pages/mine/aboutUs')"></u-cell-item>
+      <u-cell-item :title="`关于${config.name}`" @click="navigateTo('/pages/mine/set/editionIntro')"></u-cell-item>
     </u-cell-group>
     <view class="submit" @click="showModalDialog">{{userInfo.id ?'退出登录':'返回登录'}}</view>
     <u-modal show-cancel-button v-model="quitShow" @confirm="confirm" :confirm-color="lightColor" :async-close="true" :content="userInfo.id ? '确定要退出登录么？' : '确定要返回登录么？'"></u-modal>
@@ -29,9 +28,11 @@
 
 <script>
 import storage from "@/utils/storage.js";
+import config from "@/config/config";
 export default {
   data() {
     return {
+      config,
       lightColor: this.$lightColor,
       quitShow: false,
       isCertificate: false,
@@ -58,9 +59,7 @@ export default {
       storage.setAccessToken("");
       storage.setRefreshToken("");
       storage.setUserInfo({});
-      uni.redirectTo({
-        url: "/pages/passport/login",
-      });
+     this.$options.filters.navigateToLogin("redirectTo");
     },
 
     /**
@@ -136,9 +135,7 @@ export default {
                     });
                     that.getCacheSize(); // 重新计算缓存
                   },
-                  function (e) {
-                  
-                  }
+                  function (e) {}
                 );
               } else {
                 entry.remove();
@@ -195,7 +192,12 @@ export default {
   align-items: center;
   margin-bottom: 20rpx;
   .user-name {
-    flex: 1;
+    width: 500rpx;
+    overflow: hidden;
+
+    text-overflow: ellipsis;
+
+    white-space: nowrap;
     margin-left: 30rpx;
     line-height: 2em;
     font-size: 34rpx;

pages/mine/set/versionFunctionList.vue

@@ -0,0 +1,58 @@
+<template>
+  <div>
+    <u-collapse v-if="versionData.length !=0">
+      <u-collapse-item class="version-item" :title="item.versionName" v-for="(item, index) in versionData" :key="index">
+        <!-- {{item.body}} -->
+
+        {{item.content}}
+      </u-collapse-item>
+
+    </u-collapse>
+    <u-empty class="empty" v-else text="暂无版本信息" mode="list"></u-empty>
+  </div>
+</template>
+
+<script>
+import { getAppVersionList } from "@/api/message";
+export default {
+  data() {
+    return {
+      versionData: [],
+      appType: "",
+      params: {
+        pageNumber: 1,
+        pageSize: 10,
+      },
+    };
+  },
+  mounted() {
+    const platform = uni.getSystemInfoSync().platform;
+    /**
+     * 获取是否是安卓
+     */
+    if (platform === "android") {
+      this.appType = "ANDROID";
+    } else {
+      this.IosWhether = true;
+      this.appType = "IOS";
+    }
+    this.getVersionList();
+  },
+  methods: {
+    async getVersionList() {
+      let res = await getAppVersionList(this.appType, this.params);
+      if (res.data.success) {
+        this.versionData = res.data.result.records;
+      }
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.version-item{
+    padding: 10rpx;
+    background: #fff;
+}
+
+</style>

pages/mine/signIn.vue

@@ -1,26 +1,30 @@
 <template>
   <view class="sign-in">
-    <view class="signin-btn-con">
+    <view class="date-card">
+      <div class="box">
         <div class="circle-box">
           <div class="cricle" @click="signIn()">
             <span v-if="!ifSign" :class="{ active: signFlag || ifSign }">签到</span>
-          <span v-else :class="{ active: signFlag || ifSign }" :style="ifSign ? 'transform: rotateY(0deg);' : ''">已签</span>
+            <span v-else :class="{ active: signFlag || ifSign }"
+              :style="ifSign ? 'transform: rotateY(0deg);' : ''">已签</span>
           </div>
         </div>
         <text class="tips">坚持每天连续签到可以获多重奖励哦</text>
+      </div>
     </view>
     <div class="date-card">
       <view class="date-con">
         <view class="date-tit">
-          <u-row style="width: 100%;  justify-content: center;">
-            <div style="text-align: center; " class="text">{{ currentMonth }} {{ currentYear }}</div>
-          </u-row>
+          <div class="current-month">
+            <div class="day">每日记录<span> ({{ currentMonth }})</span></div>
+          </div>
         </view>
         <view class="week">
           <text v-for="item in weekArr" :key="item.id">{{ item }}</text>
         </view>
         <view class="date" v-for="obj in dataObj" :key="obj.id">
-          <view class="item" v-for="item in obj" :key="item.id" :class="item == '' ? 'hide' : ''" :animation="item == currentDay ? animationData : ''">
+          <view class="item" v-for="item in obj" :key="item.id" :class="item == '' ? 'hide' : ''"
+            :animation="item == currentDay ? animationData : ''">
             <view class="just" :class="signArr.indexOf(item) != -1 ? 'active' : ''">
               <view class="top">{{ item }} </view>
               <view class="bottom">
@@ -36,7 +40,7 @@
               ">
               <view class="top">{{ item }}</view>
               <view class="bottom">
-                <u-icon name="checkmark" color="#ff9f28"></u-icon>
+                <u-icon name="checkmark" :color="aiderLightColor"></u-icon>
               </view>
             </view>
           </view>
@@ -50,16 +54,7 @@
         <text class="close" @click="close">×</text>
       </view>
       <view class="mask-con">
-        <view class="keep-sign">
-          本月已连续签到
-          <text>{{ continuity }}</text>
-          天
-        </view>
-        <u-icon size="120" style="margin: 50rpx 0" color="#ff9f28" name="checkmark"></u-icon>
-        <view class="mark">
-          <view>获得积分</view>
-          <text>{{ continuityPoint }}</text>
-        </view>
+        <u-icon size="120" style="margin: 50rpx 0" :color="aiderLightColor" name="checkmark"></u-icon>
         <text class="text">连续签到可获得额外奖励哦！</text>
       </view>
     </view>
@@ -71,8 +66,7 @@ import { sign, signTime } from "@/api/point.js";
 export default {
   data() {
     return {
-      continuity: 1, //本月连续签到天数
-      continuityPoint: 2, //获得的积分
+      aiderLightColor:this.$aiderLightColor,
       signFlag: false,
       animationData: {},
       maskFlag: false, //
@@ -115,7 +109,6 @@ export default {
     this.getDate();
   },
   methods: {
-
     /**
      * 补0
      */
@@ -215,7 +208,6 @@ export default {
           Number(itemVal[1]) === Number(this.currentMonthIndex)
         ) {
           this.signArr.push(Number(itemVal[2]));
-         
         }
         if (
           Number(itemVal[0]) === Number(date.getFullYear()) &&
@@ -295,70 +287,79 @@ export default {
   },
 };
 </script>
-
+<style scoped>
+page {
+  background: #f7f7f7;
+}
+</style>
 <style lang="scss" scoped>
 .date-card {
-  padding: 0 40rpx;
+  padding: 0 32rpx;
+  margin: 32rpx 0;
+  box-shadow: 0 4rpx 24rpx 0 rgba($color: #f6f6f6, $alpha: 1);
 }
 .tips {
-  margin-top: 34rpx;
+  margin-top: 54rpx;
+  color: #999;
+  font-size: 24rpx;
+  letter-spacing: 1rpx;
 }
+
 .circle-box {
   width: 200rpx;
   height: 200rpx;
   border-radius: 50%;
-  margin-top: 60rpx;
-  background: #ff9f28;
+  background: $aider-light-color;
+  box-shadow: 0 4rpx 24rpx 0 rgba($color: $aider-light-color, $alpha: 1);
   display: flex;
   justify-content: center; //这个是X轴居中
   align-items: center; //这个是 Y轴居中
+ 
 }
 
 .cricle {
   width: 160rpx;
   height: 160rpx;
   border-radius: 50%;
-  background: #ff9f28;
+  background: $aider-light-color;
   text-align: center;
   line-height: 160rpx;
   color: #fff;
   font-size: 40rpx;
 }
-
-page {
-  background: #fff;
-}
-
-.sign-in {
-  color: #333;
-  .signin-btn-con {
+.current-month {
   width: 100%;
-    height: 670rpx;
-    background-image: linear-gradient(180deg, #ff6b35, #ff9f28, #ffcc03);
+  margin: 20rpx 0;
+}
+.box {
   display: flex;
   flex-direction: column;
   align-items: center;
-    text {
-      color: #fff;
-      font-size: 28rpx;
-      font-weight: 400;
+  padding:64rpx 32rpx;
+  background: #fff;
+  border-radius: 20rpx;
 }
-  }
-
+.sign-in {
+  color: #333;
   .date-con {
     background: #fff;
     min-height: 730rpx;
-    border-radius: 0.8em;
-    border: 1px solid #ededed;
+    border-radius: 20rpx;
     padding: 0 28rpx;
-    transform: translateY(-320rpx);
-    box-shadow: (1px 3px 5px rgba(0, 0, 0, 0.2));
   }
+  .day {
+    font-size: 36rpx;
 
+    > span {
+      font-size: 30rpx;
+      color: #999;
+      margin-left: 20rpx;
+    }
+  }
   .date-tit {
     display: flex;
     justify-content: space-between;
-    margin: 30rpx 0;
+    margin: 0 0 30rpx 0;
   }
 
   .week {
@@ -429,7 +430,7 @@ page {
         }
 
         .top {
-          color: #ff9f28;
+          color: $aider-light-color;
         }
       }
 
@@ -471,7 +472,7 @@ page {
       width: 540rpx;
       height: 130rpx;
       line-height: 130rpx;
-      background: #ff9f28;
+      background: $aider-light-color;
       color: #fff;
       font-size: 40rpx;
       font-weight: 500;
@@ -488,7 +489,7 @@ page {
 
     .mask-con {
       width: 540rpx;
-      height: 460rpx;
+      height: 380rpx;
       background: #fff;
       display: flex;
       flex-direction: column;

pages/navigation/search/search.scss

@@ -1,7 +1,7 @@
 .sort-active {
   border: 1px solid $light-color;
   color: $light-color;
-  background: $jd-light-color !important;
+  background: $price-light-color !important;
 }
 
 .oldKeyList {

pages/navigation/search/searchPage.vue

@@ -1,10 +1,9 @@
 <template>
   <view class="content">
     <u-navbar :background="navObj" :is-back="false">
-      <!-- mSearch组件 如果使用原样式，删除组件元素-->
-
-      <mSearch ref="mSearch" class="mSearch-input-box" @clickLeft="back" :mode="2" :placeholder="defaultKeyword" @search="doSearch(false)" @input="inputChange" @confirm="doSearch(false)"
-        @SwitchType="doSearchSwitch()" v-model="keyword" :isFocusVal="!isShowSeachGoods"></mSearch>
+      <mSearch ref="mSearch" class="mSearch-input-box" @clickLeft="back" :mode="2" :placeholder="defaultKeyword"
+        @search="doSearch(false)" @confirm="doSearch(false)" @SwitchType="doSearchSwitch()" v-model="keyword"
+        :isFocusVal="!isShowSeachGoods"></mSearch>
     </u-navbar>
 
     <view class="search-keyword" v-if="!isShowSeachGoods">
@@ -23,22 +22,19 @@
             <view class="u-tips">热门搜索</view>
           </view>
           <view class="keyword keywordBox">
-            <view class="wes" v-for="(keyword, index) in hotKeywordList" @tap="doSearch(keyword)" :key="index">{{ keyword }}</view>
+            <view class="wes" v-for="(keyword, index) in hotKeywordList" @tap="doSearch(keyword)" :key="index">
+              {{ keyword }}</view>
           </view>
-
         </view>
-
         <view class="keyword-block" v-if="oldKeywordList.length > 0">
           <view class="keyword-list-header">
             <view class="u-tips">搜索历史</view>
-
           </view>
           <div class="oldKeyList">
-
-            <div class="oldKeyItem" v-if="keyword" v-for="(keyword, index) in oldKeywordList" :key="index" @click="doSearch(keyword)">
+            <div class="oldKeyItem" v-if="keyword" v-for="(keyword, index) in oldKeywordList" :key="index"
+              @click="doSearch(keyword)">
               <span>{{ keyword }} </span>
             </div>
-
             <div @click="showMore" v-if=" oldKeywordIndex > loadIndex" class="oldKeyItem">展示更多</div>
           </div>
         </view>
@@ -54,11 +50,13 @@
           <text>销量</text>
           <view class="p-box">
             <view class="index-nav-arrow">
-              <image class="img" src="/static/index/arrow-up-1.png" v-if="params.sort === 'buyCount' && params.order === 'asc'" mode="aspectFit"></image>
+              <image class="img" src="/static/index/arrow-up-1.png"
+                v-if="params.sort === 'buyCount' && params.order === 'asc'" mode="aspectFit"></image>
               <image class="img" src="/static/index/arrow-up.png" v-else mode="aspectFit"></image>
             </view>
             <view class="index-nav-arrow">
-              <image class="img" src="/static/index/arrow-down.png" v-if="params.sort === 'buyCount' && params.order === 'desc'" mode="aspectFit"></image>
+              <image class="img" src="/static/index/arrow-down.png"
+                v-if="params.sort === 'buyCount' && params.order === 'desc'" mode="aspectFit"></image>
               <image class="img" src="/static/index/arrow-down-1.png" v-else mode="aspectFit"></image>
             </view>
           </view>
@@ -67,11 +65,13 @@
           <text>价格</text>
           <view class="p-box">
             <view class="index-nav-arrow">
-              <image class="img" src="/static/index/arrow-up-1.png" v-if="params.sort === 'price' && params.order === 'asc'" mode="aspectFit"></image>
+              <image class="img" src="/static/index/arrow-up-1.png"
+                v-if="params.sort === 'price' && params.order === 'asc'" mode="aspectFit"></image>
               <image class="img" src="/static/index/arrow-up.png" v-else mode="aspectFit"></image>
             </view>
             <view class="index-nav-arrow">
-              <image class="img" src="/static/index/arrow-down.png" v-if="params.sort === 'price' && params.order === 'desc'" mode="aspectFit"></image>
+              <image class="img" src="/static/index/arrow-down.png"
+                v-if="params.sort === 'price' && params.order === 'desc'" mode="aspectFit"></image>
               <image class="img" src="/static/index/arrow-down-1.png" v-else mode="aspectFit"></image>
             </view>
           </view>
@@ -80,20 +80,21 @@
       </view>
       <!-- 一行一个商品展示 -->
       <div v-if="isSWitch">
-        <scroll-view :style="{ height: goodsHeight }" enableBackToTop="true" lower-threshold="250" @scrolltolower="loadmore()" scroll-with-animation scroll-y class="scoll-page">
+        <scroll-view :style="{ height: goodsHeight }" enableBackToTop="true" lower-threshold="250"
+          @scrolltolower="loadmore()" scroll-with-animation scroll-y class="scoll-page">
           <div class="goodsClass">
             <u-row v-for="(item, index) in goodsList" :key="index" class="goodsRow">
               <u-col :span="4" @click.native="navigateToDetailPage(item)" class="switchType1">
-                <u-image width="182rpx" height="200rpx" class="imgGoods" :src="item.thumbnail">
+                <u-image width="182rpx" height="200rpx" class="imgGoods" :src="item.content.thumbnail">
                   <u-loading slot="loading"></u-loading>
                 </u-image>
               </u-col>
               <u-col :span="8" @click.native="navigateToDetailPage(item)" class="switchType2">
-                <div class="title clamp3" style="">{{ item.goodsName }}</div>
+                <div class="title clamp3" style="">{{ item.content.goodsName }}</div>
                 <view class="price-box">
-                  <div class="price" v-if="item.price!=undefined">
-                    ¥<span>{{ formatPrice(item.price )[0] }} </span>.{{
-                      formatPrice(item.price )[1]
+                  <div class="price" v-if="item.content.price!=undefined">
+                    ¥<span>{{ formatPrice(item.content.price )[0] }} </span>.{{
+                      formatPrice(item.content.price )[1]
                     }}
                   </div>
                 </view>
@@ -113,7 +114,8 @@
               <u-col :span="12" class="storeSellerBox">
                 <div class="storeSellerName" @click="clickTostore()">
                   <div class="textHidden">
-                    <u-tag style="margin-right: 10rpx" size="mini" mode="dark" v-if="item.selfOperated" text="自营" type="error" />
+                    <u-tag style="margin-right: 10rpx" size="mini" mode="dark" v-if="item.selfOperated" text="自营"
+                      type="error" />
 
                     <span style="
                         color: #333333;
@@ -148,19 +150,21 @@
           !isSWitch &&
           !(goodsList == [] || goodsList == '' || goodsList == null)
         ">
-        <scroll-view :style="{ height: goodsHeight }" scroll-anchoring enableBackToTop="true" @scrolltolower="loadmore()" scroll-with-animation scroll-y lower-threshold="250" class="scoll-page">
+        <scroll-view :style="{ height: goodsHeight }" scroll-anchoring enableBackToTop="true"
+          @scrolltolower="loadmore()" scroll-with-animation scroll-y lower-threshold="250" class="scoll-page">
           <view class="goods-list">
-            <view v-for="(item, index) in goodsList" :key="index" class="goods-item" @click="navigateToDetailPage(item)">
+            <view v-for="(item, index) in goodsList" :key="index" class="goods-item"
+              @click="navigateToDetailPage(item)">
               <view class="image-wrapper">
-                <image :src="item.thumbnail" mode="aspectFill"></image>
+                <image :src="item.content.thumbnail" mode="aspectFill"></image>
               </view>
               <view class="goods-detail">
-                <div class="title clamp">{{ item.goodsName }}</div>
+                <div class="title clamp">{{ item.content.goodsName }}</div>
                 <view class="price-box">
-                  <div class="price" v-if="item.price!=undefined">
+                  <div class="price" v-if="item.content.price!=undefined">
 
-                    ¥<span>{{ formatPrice(item.price )[0] }} </span>.{{
-                      formatPrice(item.price )[1]
+                    ¥<span>{{ formatPrice(item.content.price )[0] }} </span>.{{
+                      formatPrice(item.content.price )[1]
                     }}
                   </div>
                 </view>
@@ -179,7 +183,8 @@
                 </div>
                 <div class="storeSellerName">
                   <div class="textHidden">
-                    <u-tag style="margin-right: 10rpx" size="mini" mode="dark" v-if="item.selfOperated == 1" text="自营" type="error" />
+                    <u-tag style="margin-right: 10rpx" size="mini" mode="dark" v-if="item.selfOperated" text="自营"
+                      type="error" />
                     <span>{{ item.storeName || "暂无" }}</span>
                   </div>
                   <span>
@@ -201,7 +206,8 @@
           <view class="sort-item">
             <view class="sort-title"> 品牌 </view>
             <view class="flex" v-if="sortData.brands">
-              <view class="sort-brand-item" :key="brandsIndex" v-for="(brand, brandsIndex) in sortData.brands" @click="handleSort(brand, brandsIndex, 'brand')">
+              <view class="sort-brand-item" :key="brandsIndex" v-for="(brand, brandsIndex) in sortData.brands"
+                @click="handleSort(brand, brandsIndex, 'brand')">
                 <view class="sort-radius" :class="{
                     'sort-active': brand.__selected,
                   }">
@@ -214,7 +220,9 @@
           <view class="sort-item">
             <view class="sort-title"> 全部分类 </view>
             <view class="flex" style="flex-wrap: wrap;" v-if="sortData.categories">
-              <view class="sort-brand-item" :key="categoriesIndex" v-for="(categoryId, categoriesIndex) in sortData.categories" @click="handleSort(categoryId, categoriesIndex, 'categoryId')">
+              <view class="sort-brand-item" :key="categoriesIndex"
+                v-for="(categoryId, categoriesIndex) in sortData.categories"
+                @click="handleSort(categoryId, categoriesIndex, 'categoryId')">
                 <view class="sort-radius" :class="{
                     'sort-active': categoryId.__selected,
                   }">
@@ -248,7 +256,8 @@
           <view class="sort-item" :key="paramIndex" v-for="(param, paramIndex) in sortData.paramOptions">
             <view class="sort-title"> {{ param.key }} </view>
             <view class="flex" style="flex-warp:warp" v-if="param.values">
-              <view class="sort-brand-item" :key="i" v-for="(value, i) in param.values" @click="handleSort(value, i, 'prop', param)">
+              <view class="sort-brand-item" :key="i" v-for="(value, i) in param.values"
+                @click="handleSort(value, i, 'prop', param)">
                 <view class="sort-radius" :class="{
                     'sort-active': value.__selected,
                   }">
@@ -274,7 +283,7 @@ import { getGoodsList, getGoodsRelated } from "@/api/goods.js";
 
 import { getHotKeywords } from "@/api/home.js";
 import mSearch from "@/components/m-search-revision/m-search-revision.vue";
-
+import storage from "@/utils/storage";
 export default {
   data() {
     return {
@@ -314,7 +323,7 @@ export default {
       isSWitch: false,
 
       params: {
-        pageNumber: 0,
+        pageNumber: 1,
         pageSize: 10,
         // sort: 'grade_asc',
         sort: "releaseTime",
@@ -324,7 +333,7 @@ export default {
       minPrice: "",
       maxPrice: "",
       sortParams: {
-        pageNumber: 0,
+        pageNumber: 1,
         pageSize: 10,
 
         // price: "", //价格,示例值(10_30)
@@ -337,7 +346,6 @@ export default {
     };
   },
   onLoad(val) {
-    // return false
     this.init();
     this.initSortGoods();
     // 接收分类的数据
@@ -360,9 +368,22 @@ export default {
     this.loadData();
   },
   components: {
-    //引用mSearch组件，如不需要删除即可
     mSearch,
   },
+  watch: {
+    /**
+     * 将搜索的字和热词进行匹配,如果为热词则不改商品搜索关键字
+     */
+    keyword(val) {
+      if (val) {
+        if (val) {
+          this.defaultKeyword = val;
+        }
+      } else {
+        this.defaultKeyword = "请输入搜索商品";
+      }
+    },
+  },
 
   onReachBottom() {
     this.params.pageNumber++;
@@ -474,7 +495,7 @@ export default {
       this.minPrice = "";
       this.maxPrice = "";
       this.params = {
-        pageNumber: 0,
+        pageNumber: 1,
         pageSize: 10,
       };
       this.loadData();
@@ -497,8 +518,9 @@ export default {
     },
 
     init() {
-      this.loadDefaultKeyword();
+      // 加载搜索记录
       this.loadOldKeyword(this.loadIndex);
+      // 加载热词
       this.loadHotKeyword();
     },
     blur() {
@@ -511,7 +533,7 @@ export default {
     },
     navigateToDetailPage(item) {
       uni.navigateTo({
-        url: `/pages/product/goods?id=${item.id}&goodsId=${item.goodsId}`,
+        url: `/pages/product/goods?id=${item.content.id}&goodsId=${item.content.goodsId}`,
       });
     },
     loadmore() {
@@ -545,7 +567,7 @@ export default {
     },
 
     tabClick(index, type) {
-      this.params.pageNumber = 0;
+      this.params.pageNumber = 1;
       this.params.pageSize = 10;
       // this.params.order = "desc";
       if (this.params.sort == type) {
@@ -577,8 +599,16 @@ export default {
     },
     //加载默认搜索关键字
     loadDefaultKeyword() {
-      //定义默认搜索关键字，可以自己实现ajax请求数据再赋值,用户未输入时，以水印方式显示在输入框，直接不输入内容搜索会搜索默认关键字
+      /**
+       * 定义默认搜索关键字会根据当前热门搜索来进行显示
+       * 如果当前热门搜索没有的话，则会显示默认关键字
+       */
+      if (this.hotKeywordList.length != 0) {
+        //
+        this.defaultKeyword = this.hotKeywordList[0];
+      } else {
         this.defaultKeyword = "请输入搜索商品";
+      }
     },
     //加载历史搜索,自动读取本地Storage
     loadOldKeyword(index) {
@@ -594,15 +624,39 @@ export default {
         },
       });
     },
-    //加载热门搜索
+
+    /**
+     * 加载热门搜索
+     * 1.5分钟之后更新缓存
+     * 2.如果有缓存热门关键字则去请求缓存
+     */
     async loadHotKeyword() {
       this.hotKeywordList = [];
-      let res = await getHotKeywords();
+      if (
+        !storage.getHotWords().time ||
+        storage.getHotWords().time <= new Date().getTime() / 1000
+      ) {
+        // 没有缓存或者第一次进入请求接口保存缓存
+        let res = await getHotKeywords(10);
         let keywords = res.data.result;
 
         keywords.forEach((item) => {
           this.hotKeywordList.push(item);
         });
+
+        let hotData = {
+          time: new Date().getTime() / 1000 + 30 * 5,
+          keywords: keywords,
+        };
+        storage.setHotWords(hotData);
+      } else {
+        let keywords = storage.getHotWords().keywords;
+
+        keywords.forEach((item) => {
+          this.hotKeywordList.push(item);
+        });
+      }
+      this.loadDefaultKeyword();
     },
     //加载商品 ，带下拉刷新和上滑加载
     async loadData(type, loading) {
@@ -610,7 +664,7 @@ export default {
       if (type == "refresh") {
         this.goodsList = [];
       }
-      //没有更多直接返回
+      //没有更多直接返回 #TODO
       let goodsList = await getGoodsList(this.params);
 
       if (goodsList.data.result.content.length < 10) {
@@ -620,19 +674,7 @@ export default {
       this.initSortGoods();
       uni.hideLoading();
     },
-    //监听输入
-    inputChange(event) {
-      //兼容引入组件时传入参数情况
-      var keyword = event.detail ? event.detail.value : event;
-      if (!keyword) {
-        this.keywordList = [];
-        this.isShowKeywordList = false;
-        return;
-      }
-      this.isShowKeywordList = true;
 
-      this.getKeywordNumFun(keyword);
-    },
     //高亮关键字
     drawCorrelativeKeyword(keywords, keyword) {
       var len = keywords.length,
@@ -663,7 +705,6 @@ export default {
         content: "确定清除历史搜索记录？",
         success: (res) => {
           if (res.confirm) {
-           
             this.oldKeywordList = [];
             uni.removeStorage({
               key: "OldKeys",
@@ -674,27 +715,39 @@ export default {
     },
 
     // 样式修改布局
-    doSearchSwitch(val) {
+    doSearchSwitch() {
       this.isSWitch = !this.isSWitch;
       this.isShowSeachGoods = true;
     },
 
-    //执行搜索
+    /**
+     * 执行搜索
+     */
     doSearch(keyword) {
+      //  用户自行搜索/热门搜索/搜索历史
       keyword = keyword === false ? this.keyword : keyword;
-      this.keyword = keyword;
+
+      if (!keyword) {
+        /**
+         * 进行空搜索
+         * 第一次搜索如果没有关键词会将热门搜索中第一个热词进行判定
+         * 如果没有热词则会展示一个空词搜索
+         */
+        keyword = (this.hotKeywordList.length && this.hotKeywordList[0]) || "";
+      }
+      this.defaultKeyword == "请输入搜索商品" ? (keyword = "") : "";
+      // this.keyword = keyword;
+      keyword ? (this.keyword = keyword) : "";
       this.saveKeyword(keyword); //保存为历史
       this.isShowSeachGoods = true;
       this.$refs.mSearch.isShowSeachGoods = true;
-      this.params.keyword = keyword;
-      this.params.pageNumber = 0;
+      this.params.keyword = this.keyword;
+      this.params.pageNumber = 1;
       this.$set(this.sortParams, "keyword", keyword);
-
       this.loadData("refresh", 1);
     },
     //保存关键字到历史记录
     saveKeyword(keyword) {
-      
       if (!keyword) return false;
       uni.getStorage({
         key: "OldKeys",
@@ -715,7 +768,6 @@ export default {
             data: JSON.stringify(OldKeys),
           });
           this.oldKeywordList = OldKeys; //更新历史搜索
-        
         },
         fail: (e) => {
           var OldKeys = [keyword];
@@ -727,12 +779,6 @@ export default {
         },
       });
     },
-
-    // 搜索关键字
-    getKeywordNumFun(keywords) {
-      this.params.keyword = keywords;
-      this.$set(this.sortParams, "keyword", keywords);
-    },
   },
 };
 </script>

pages/navigation/selectShops.vue

@@ -1,325 +0,0 @@
-<template>
-  <view class="selected-store">
-    <!-- 点击搜索出现搜索框 -->
-    <!-- <div v-show="searchHandle" class="searchBox">
-			<u-search placeholder="请输入关键字" :clearabled="true" :show-action="false" v-model="pageParams.name"   @blur="searchStore()" @clear="clearSearch()"	 @confirm="searchStore()"  ></u-search>
-		</div> -->
-    <div>
-      <empty v-if="nomsg"></empty>
-      <div class="swiper-item">
-        <scroll-view class="scroll-v" enableBackToTop="true" scroll-with-animation scroll-y>
-          <view class="index-item" v-for="(store,storeIndex) in stores" :key="storeIndex" @click.prevent="storeDetail(store.id)">
-            <div class="item-goods">
-              <u-image width="51px" height="51px" class="item-title-img" :src="store.storeLogo || noLogo">
-                <u-loading slot="loading"></u-loading>
-              </u-image>
-              <view class="item-content">
-                <view>
-                  <span>{{ store.storeName }}</span><span class="self-store" v-if="store.selfOperated">自营</span>
-                </view>
-                <view>
-                  <u-rate size="24" :count="5" :disabled="true" v-model="store.descriptionScore"></u-rate>
-                </view>
-                <view>{{ store.store_collect }} 关注</view>
-                <button v-if="store.is_connect==0" @click.stop="collectstore(store.id)" class="collect btn-mini">
-                  <u-icon name="plus"></u-icon>关注
-                </button>
-                <button v-if="store.is_connect==1" @click.stop="collectstore(store.id)" class="collect btn-mini"></u-icon>已关注</button>
-              </view>
-              <view class="store-num">
-                <!-- <view> {{store.goods_num}}</view> -->
-                <view>进店逛逛</view>
-              </view>
-
-            </div>
-          </view>
-          <uni-load-more :status="loadStatus"></uni-load-more>
-        </scroll-view>
-
-      </div>
-    </div>
-  </view>
-</template>
-
-<script>
-import { collectionStore } from "@/api/members.js";
-import { getstoreList } from "@/api/store.js";
-export default {
-  data() {
-    return {
-      tabIndex: 0,
-      currentLeft: 0,
-      stores: [],
-      pageParams: {
-        pageNumber: 1, //页码
-        pageSize: 10, //分页大小
-        category_id: 0, //分类
-        key_words: "", //搜索关键字
-        name: "", //店铺名字
-      },
-      loadStatus: "more",
-      nomsg: false,
-      noLogo: require("@/static/logo.png"),
-    };
-  },
-  onLoad() {
-    this.searchStore();
-  },
-  watch: {
-    tabIndex(val) {
-      this.pageParams.pageNumber = 1;
-      this.stores = [];
-      this.loadStatus = "more";
-      this.searchStore();
-    },
-  },
-  onReachBottom() {
-   
-    this.pageParams.pageNumber++;
-    this.searchStore();
-  },
-  methods: {
-    // 清空店铺
-    clearSearch() {
-      (this.pageParams = {
-        pageNumber: 1, //页码
-        pageSize: 10, //分页大小
-        category_id: 0, //分类
-        key_words: "", //搜索关键字
-        name: "", //店铺名字
-      }),
-        this.searchStore();
-    },
-
-    async searchStore() {
-      uni.showLoading({
-        title: "加载中",
-      });
-
-      //获取商品数据
-      let response = await getstoreList(this.pageParams);
-      uni.hideLoading();
-      if (this.pageParams.name) {
-        this.stores = [];
-      }
-
-      this.stores = this.stores.concat(response.data.result.records);
-      uni.hideLoading();
-      if (
-        response.data.result.total <=
-        response.data.result.current * response.data.result.size
-      ) {
-        this.loadStatus = "noMore";
-      } else {
-        this.loadStatus = "loadmore";
-      }
-      if (this.stores.length == 0) {
-        this.nomsg = true;
-        return;
-      }
-    },
-
-    collectstore(id) {
-      //收藏店铺
-      collectionStore(id).then((res) => {
-        if (res.statusCode == 200) {
-          this.$api.msg("收藏成功");
-          this.pageParams.pageNumber = 1;
-          this.stores = [];
-          this.searchStore();
-        }
-      });
-    },
-    storeDetail(id) {
-      uni.navigateTo({
-        url: "/pages/product/shopPage?id=" + id,
-      });
-    },
-  },
-};
-</script>
-<style>
-page {
-  height: 100%;
-}
-</style>
-<style lang="scss" scoped>
-.searchBox {
-  margin: 20rpx 0;
-}
-
-.selected-store {
-  height: 100%;
-
-  .list-scroll-content {
-    position: relative;
-    width: 100%;
-    display: flex;
-    white-space: nowrap;
-    align-items: center;
-    justify-content: space-between;
-    align-items: center;
-    background-color: #fff;
-    color: #333;
-
-    .tab-item {
-      width: 160rpx;
-      height: 80rpx;
-      line-height: 80rpx;
-      text-align: center;
-      display: inline-block;
-    }
-
-    .active {
-      border-bottom: 2px solid #ffffff;
-      broder-width: 60rpx;
-      font-size: 30rpx;
-      padding-bottom: 4rpx;
-    }
-  }
-
-  .swiper-box {
-    height: calc(100% - 80rpx);
-
-    .scroll-v {
-      height: 100%;
-    }
-  }
-  .index-item {
-    // height: 535rpx;
-    margin: 20rpx;
-    background-color: #ffffff;
-    border-radius: 14rpx;
-
-    .item-goods {
-      height: 170rpx;
-      margin: 0 20rpx;
-      padding: 30rpx 0;
-      // border-bottom: 1px solid #eeeeee;
-      display: flex;
-      align-items: center;
-
-      image {
-        width: 102rpx;
-        height: 102rpx;
-        border-radius: 50%;
-      }
-      .item-title-img {
-        width: 102rpx !important;
-        height: 102rpx !important;
-        border-radius: 50% !important;
-      }
-
-      .item-content {
-        flex: 1;
-        line-height: 2em;
-        font-size: $font-sm;
-        position: relative;
-        .collect {
-          position: absolute;
-          width: 100rpx;
-          height: 40rpx;
-          font-size: 26rpx;
-          bottom: 20rpx;
-          right: 30rpx;
-          padding: 0;
-          line-height: 40rpx;
-          text-align: right;
-          padding-right: 14rpx;
-          .u-icon {
-            font-size: 26rpx;
-            position: absolute;
-            top: 7rpx;
-            left: 10rpx;
-            margin-right: 5rpx;
-          }
-        }
-        > view:first-child {
-          font-size: $font-base;
-          color: #333333;
-          font-weight: 700;
-          position: relative;
-
-          span:nth-child(2) {
-            position: absolute;
-            font-weight: 400;
-            top: 12rpx;
-            font-size: 18rpx;
-            margin-left: 20rpx;
-            height: 26rpx;
-            width: 50rpx;
-            line-height: 26rpx;
-            text-align: center;
-            color: #ffffff;
-            background-color: #ff6262;
-            border-radius: 4rpx;
-          }
-        }
-
-        color: #999;
-        margin-left: 30rpx;
-      }
-
-      .store-num {
-        width: 150rpx;
-        text-align: center;
-        border-left: 1px solid #eeeeee;
-
-        :nth-child(1) {
-          font-size: 26rpx;
-        }
-
-        :nth-child(2) {
-          font-size: 18rpx;
-          color: #999;
-        }
-      }
-    }
-  }
-
-  .goods-in-store {
-    height: 364rpx;
-    white-space: nowrap;
-    padding: 20rpx 0 20rpx 20rpx;
-
-    .goods-item {
-      width: 195rpx;
-      display: inline-block;
-      white-space: normal;
-      margin-right: 20rpx;
-      font-size: $font-sm;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-
-      image {
-        width: 195rpx;
-        height: 195rpx;
-        border-radius: 8rpx;
-      }
-
-      > view {
-        margin-top: 10rpx;
-      }
-      .goods-item-img {
-        width: 195rpx !important;
-        height: 195rpx !important;
-        border-radius: 8rpx !important;
-      }
-
-      > view:nth-child(2) {
-        color: #ff5a10;
-      }
-
-      .goods-name {
-        overflow: hidden;
-        text-overflow: ellipsis;
-        white-space: nowrap;
-        display: -webkit-box;
-        -webkit-box-orient: vertical;
-        -webkit-line-clamp: 2;
-      }
-    }
-  }
-}
-</style>

pages/order/afterSales/afterSales.vue

@@ -3,6 +3,9 @@
     <view class="u-tabs-box">
       <u-tabs bg-color="#fff" :list="list" :is-scroll="false" :current="current" @change="change" :active-color="$lightColor"></u-tabs>
     </view>
+    <div class="u-tabs-search">
+      <u-search placeholder="请输入订单编号" @search="handleGetOrderList(current)" @clear="handleGetOrderList(current)" @custom="handleGetOrderList(current)" v-model="params.orderSn"></u-search>
+    </div>
     <scroll-view class="body-view" scroll-y @scrolltolower="renderDate">
       <view class="seller-view" v-for="(order, orderIndex) in orderList" :key="orderIndex">
         <!-- 店铺名称 -->
@@ -126,6 +129,8 @@ export default {
       params: {
         pageNumber: 1,
         pageSize: 10,
+        sort: "createTime",
+        order: "desc",
       },
 
       logParams: {
@@ -135,15 +140,20 @@ export default {
       status: "loadmore",
     };
   },
-  onLoad() {
+  onLoad(options) {
     this.orderList = [];
     this.params.pageNumber = 1;
+    if (options.orderSn) this.params.orderSn = options.orderSn;
     this.getOrderList(this.current);
   },
   onPullDownRefresh() {
     this.change(this.current);
   },
   methods: {
+    handleGetOrderList(current) {
+      this.orderList = [];
+      this.getOrderList(current);
+    },
     /**
      * 切换tab页时，初始化数据
      */
@@ -161,6 +171,8 @@ export default {
         this.logParams = {
           pageNumber: 1,
           pageSize: 10,
+          sort: "createTime",
+          order: "desc",
         };
         if (index === 1) {
           this.logParams.serviceStatus = "APPLY";
@@ -220,7 +232,6 @@ export default {
               price: item.flowPrice,
             },
           ];
-    
         });
 
         this.orderList = this.orderList.concat(afterSaleLogList);
@@ -296,9 +307,12 @@ page,
   height: 100%;
 }
 .body-view {
-  // height: calc(100vh - 44px -40px);
-  // overflow-y: auto;
-  height: 100%;
+  overflow-y: auto;
+  height: calc(100vh - 44px - 80rpx - 104rpx);
+}
+.u-tabs-search {
+  padding: 20rpx;
+  background: #fff;
 }
 .countMoney {
   margin-left: 7rpx;

pages/order/afterSales/afterSalesDetail.vue

@@ -59,8 +59,7 @@
           </u-form-item>
           <view v-if="
               applyInfo.accountType === 'BANK_TRANSFER' &&
-              applyInfo.applyRefundPrice != 0
-            ">
+              applyInfo.applyRefundPrice != 0">
             <u-form-item label="银行开户行" :label-width="150">
               <u-input v-model="form.bankDepositName" type="text" input-align="right" placeholder="请输入银行开户行" />
             </u-form-item>
@@ -100,7 +99,7 @@ import {
 
 import city from "@/components/m-city/m-city";
 import { upload } from "@/api/common.js";
-
+import { checkBankno } from "@/utils/Foundation";
 import storage from "@/utils/storage.js";
 export default {
   component: {
@@ -191,7 +190,7 @@ export default {
     this.sn = options.sn;
     let dsku = decodeURIComponent(options.sku);
     let newSku = JSON.parse(dsku);
-    this.sku = newSku
+    this.sku = newSku;
 
     this.form.orderItemSn = options.sn;
     this.form.skuId = this.sku.skuId;
@@ -254,9 +253,7 @@ export default {
       this.form.accountType_label = e[0].label;
     },
     //返回方式
-    returnSelectConfirm(e) {
-     
-    },
+    returnSelectConfirm(e) {},
 
     //修改申请数量
     valChange(e) {
@@ -264,7 +261,6 @@ export default {
     },
     //图片上传
     onUploaded(lists) {
-    
       let images = [];
 
       lists.forEach((item) => {
@@ -278,6 +274,7 @@ export default {
       if (!this.handleCheckParams()) {
         return;
       }
+
       uni.showLoading({
         title: "加载中",
       });
@@ -297,74 +294,8 @@ export default {
         }
       });
     },
-
-    /**
-     * 验证银行卡号
-     */
-    checkBankno(bankno) {
-      var lastNum = bankno.substr(bankno.length - 1, 1); //取出最后一位（与luhm进行比较）
-      var first15Num = bankno.substr(0, bankno.length - 1); //前15或18位
-      var newArr = [];
-
-      for (var i = first15Num.length - 1; i > -1; i--) {
-        //前15或18位倒序存进数组
-        newArr.push(first15Num.substr(i, 1));
-      }
-
-      var arrJiShu = []; //奇数位*2的积 <9
-      var arrJiShu2 = []; //奇数位*2的积 >9
-      var arrOuShu = []; //偶数位数组
-      for (var j = 0; j < newArr.length; j++) {
-        if ((j + 1) % 2 == 1) {
-          //奇数位
-          if (parseInt(newArr[j]) * 2 < 9)
-            arrJiShu.push(parseInt(newArr[j]) * 2);
-          else arrJiShu2.push(parseInt(newArr[j]) * 2);
-        } //偶数位
-        else arrOuShu.push(newArr[j]);
-      }
-
-      var jishu_child1 = []; //奇数位*2 >9 的分割之后的数组个位数
-      var jishu_child2 = []; //奇数位*2 >9 的分割之后的数组十位数
-      for (var h = 0; h < arrJiShu2.length; h++) {
-        jishu_child1.push(parseInt(arrJiShu2[h]) % 10);
-        jishu_child2.push(parseInt(arrJiShu2[h]) / 10);
-      }
-
-      var sumJiShu = 0; //奇数位*2 < 9 的数组之和
-      var sumOuShu = 0; //偶数位数组之和
-      var sumJiShuChild1 = 0; //奇数位*2 >9 的分割之后的数组个位数之和
-      var sumJiShuChild2 = 0; //奇数位*2 >9 的分割之后的数组十位数之和
-      var sumTotal = 0;
-      for (var m = 0; m < arrJiShu.length; m++) {
-        sumJiShu = sumJiShu + parseInt(arrJiShu[m]);
-      }
-      for (var n = 0; n < arrOuShu.length; n++) {
-        sumOuShu = sumOuShu + parseInt(arrOuShu[n]);
-      }
-      for (var p = 0; p < jishu_child1.length; p++) {
-        sumJiShuChild1 = sumJiShuChild1 + parseInt(jishu_child1[p]);
-        sumJiShuChild2 = sumJiShuChild2 + parseInt(jishu_child2[p]);
-      }
-      //计算总和
-      sumTotal =
-        parseInt(sumJiShu) +
-        parseInt(sumOuShu) +
-        parseInt(sumJiShuChild1) +
-        parseInt(sumJiShuChild2);
-      //计算Luhm值
-      var k = parseInt(sumTotal) % 10 == 0 ? 10 : parseInt(sumTotal) % 10;
-      var luhm = 10 - k;
-      if (lastNum == luhm) {
-        return true;
-      } else {
-        return false;
-      }
-    },
-
     //检测提交参数
     handleCheckParams() {
-     
       if (this.$u.test.isEmpty(this.form.reason)) {
         this.$refs.uToast.show({ title: "请选择 退款原因", type: "error" });
         return false;
@@ -398,7 +329,7 @@ export default {
             type: "error",
           });
           return false;
-        } else if (this.checkBankno(this.form.bankAccountNumber) === false) {
+        } else if (checkBankno(this.form.bankAccountNumber) === false) {
           this.$refs.uToast.show({
             title: "银行卡卡号不正确",
             type: "error",
@@ -531,7 +462,7 @@ page,
     align-items: center;
   }
   .images-view {
-    padding: 20rpx;
+    
     display: flex;
     flex-direction: row;
     align-items: center;
@@ -553,7 +484,12 @@ page,
   background-color: #ffffff;
   height: 100rpx;
   width: 750rpx;
+  display: flex;
   align-items: center;
-  padding: 0rpx 20rpx;
+  width: 100%;
+  /deep/ .u-btn{
+    width: 94% !important;
+
+  }
 }
 </style>

pages/order/afterSales/afterSalesSelect.vue

@@ -26,7 +26,7 @@
     </view>
 
     <view class="select-view">
-      <view class="select-cell" @click="onSelect(1)">
+      <view class="select-cell"  v-if="applyInfo.returnGoods"  @click="onSelect(1)">
         <view class="select-image">
           <image style="height: 51rpx; width: 51rpx" src="/static/order/t1.png"></image>
         </view>
@@ -38,7 +38,7 @@
           </view>
         </view>
       </view>
-      <view class="select-cell" @click="onSelect(3)">
+      <view class="select-cell" v-if="applyInfo.returnMoney"  @click="onSelect(3)">
         <view class="select-image">
           <image style="height: 51rpx; width: 51rpx" src="/static/order/t3.png"></image>
         </view>
@@ -56,6 +56,8 @@
 
 <script>
 import UniIcons from "@/components/uni-icons/uni-icons.vue";
+
+import { getAfterSaleInfo } from "@/api/after-sale";
 export default {
   components: {
     UniIcons,
@@ -64,6 +66,7 @@ export default {
     return {
       sn: "",
       sku: {}, //sku
+      applyInfo:""
     };
   },
   onLoad(options) {
@@ -71,8 +74,20 @@ export default {
     let dData = decodeURIComponent(options.sku);
     let newData = JSON.parse(dData);
     this.sku = newData;
+
+    // 查看当前商品是否支持退款退货
+    this.init()
   },
   methods: {
+    // 初始化数据
+    init() {
+      getAfterSaleInfo(this.sn).then((response) => {
+        if (response.data.success) {
+          this.applyInfo = response.data.result;
+        }
+      });
+    },
+
     /**
      * 选择退货流程
      */

pages/order/afterSales/applyDetail.vue

@@ -75,7 +75,7 @@
       </view>
       <view class="detail-item">
         <view class="title">申请原因:</view>
-        <view class="value">{{ serviceDetail.reason }}</view>
+        <view class="value">{{ reason }}</view>
       </view>
       <!-- <view class="detail-item" v-if="serviceDetail.apply_vouchers">
 				<view class="title">申请凭证:</view>
@@ -195,6 +195,7 @@ import {
   getServiceDetail,
   getstoreAfterSaleAddress,
   getAfterSaleLog,
+  getAfterSaleReason,
 } from "@/api/after-sale.js";
 import UniIcons from "@/components/uni-icons/uni-icons.vue";
 
@@ -204,6 +205,7 @@ export default {
   },
   data() {
     return {
+      reason: "", //申请原因
       serviceTypeList: {
         // 售后类型
         CANCEL: "取消",
@@ -330,6 +332,20 @@ export default {
       });
     },
 
+    /**
+     * 获取申请原因
+     */
+    getReasonList(serviceType) {
+      getAfterSaleReason(serviceType).then((res) => {
+        if (res.data.success) {
+          // 1357583466371219456
+          this.reason = res.data.result.filter((item) => {
+            return item.id == this.serviceDetail.reason;
+          })[0].reason;
+        }
+      });
+    },
+
     /**
      * 初始化详情
      */
@@ -340,7 +356,10 @@ export default {
       getServiceDetail(this.sn).then((res) => {
         uni.hideLoading();
         this.serviceDetail = res.data.result;
-        if (this.serviceDetail.serviceType == "RETURN_GOODS") {
+        if (
+          this.serviceDetail.serviceType == "RETURN_GOODS" ||
+          this.serviceDetail.serviceType === "RETURN_MONEY"
+        ) {
           this.refundShow = true;
         }
 
@@ -349,10 +368,13 @@ export default {
             this.serviceDetail.serviceType === "ORDER_CANCEL") &&
           this.serviceDetail.refundWay === "OFFLINE";
         this.bankShow =
-          (this.serviceDetail.serviceType === "RETURN_GOODS" ||
+          this.serviceDetail.serviceType === "RETURN_MONEY" ||
+          ((this.serviceDetail.serviceType === "RETURN_GOODS" ||
             this.serviceDetail.serviceType === "ORDER_CANCEL") &&
             this.serviceDetail.refundWay === "OFFLINE" &&
-          this.serviceDetail.accountType === "BANK_TRANSFER";
+            this.serviceDetail.accountType === "BANK_TRANSFER");
+
+        this.getReasonList(this.serviceDetail.serviceType);
       });
     },
 

pages/order/complain/complainInfo.vue

@@ -103,7 +103,9 @@ export default {
 .row {
   display: flex;
   flex-wrap: wrap;
+  padding: 26rpx 32rpx;
 }
+
 .speak-msg {
   padding: 26rpx 32rpx;
   > span {
@@ -120,6 +122,6 @@ export default {
   padding: 16rpx;
 }
 .tips {
-  margin: 40rpx 0;
+  margin: 40rpx 32rpx;
 }
 </style>

pages/order/evaluate/evaluateDetail.vue

@@ -25,7 +25,16 @@
           {{ comment.goodsName }}
         </view>
         <view class="goods-subtitle"></view>
-
+        <view class="commentStyle" v-if="comment.reply">
+          商家回复：
+          <span class="addCommentSpan">{{ comment.reply }}</span>
+          <view class="img">
+            <!-- 循环出商家回复评价的图片 -->
+            <u-image width="140rpx" height="140rpx" v-if="comment.replyImage" v-for="(replyImg, replyIndex) in splitImg(comment.replyImage)" :src="replyImg" :key="replyIndex"
+              @click="preview(splitImg( comment.replyImage), index)">
+            </u-image>
+          </view>
+        </view>
       </view>
     </view>
   </view>
@@ -49,6 +58,18 @@ export default {
     this.comment = JSON.parse(decodeURIComponent(options.comment));
   },
   methods: {
+    /**
+     * 切割图像
+     */
+    splitImg(val) {
+      if (val && val.split(",")) {
+        return val.split(",");
+      } else if (val) {
+        return val;
+      } else {
+        return false;
+      }
+    },
     /**
      * 点击图片放大或保存
      */
@@ -68,6 +89,38 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.commentStyle {
+  margin-top: 16rpx;
+  padding: 14rpx 26rpx;
+  background: #f5f5f5;
+  border-radius: 6px;
+  font-size: 22rpx;
+  font-weight: 700;
+  text-align: left;
+  line-height: 40rpx;
+}
+.img {
+  display: flex;
+  flex-wrap: wrap;
+  /* height: 140rpx; */
+  overflow: hidden;
+  margin: 10rpx 0;
+
+  image {
+    width: 166rpx;
+    height: 166rpx;
+    margin: 0 15rpx 15rpx 0;
+
+    &:nth-of-type(3n + 0) {
+      margin: 0 0 15rpx 0;
+    }
+  }
+}
+
+.addCommentSpan {
+  color: $u-tips-color !important;
+  padding-left: 20rpx;
+}
 .memName {
   font-size: 28rpx;
 }

pages/order/fillorder.vue

@@ -1,48 +1,38 @@
 <template>
   <div class="wrapper">
     <!-- 选择地址 -->
-    <div class="box1 box">
-      <u-row style="margin-top: 32rpx">
-        <u-col style="padding: 0 !important" :offset="0" :span="11" @click.native="clickToAddress()">
+    <div class="address-box" @click="clickToAddress()">
+      <div class="user-box flex">
+        <div class="flex-8">
           <div v-if="!address.id">请选择地址</div>
           <div v-else>
-            <div class="userClass">
-              {{ address.name }}
-              <span>
-                {{ address.mobile | secrecyMobile }}
-                <u-tag v-if="address.isDefault" text="默认" style="margin-left: 24rpx" mode="plain" type="error" size="mini" />
+            <div class="user-address">
+              <!-- 省市区 -->
+              <div class="flex flex-a-c">
+                <span class="default" v-if="address.isDefault">默认</span>
+                <div class="address-list" v-if="address.consigneeAddressPath.length != 0">
+                  <span class="address-item" v-for="(item,index) in address.consigneeAddressPath" :key="index">
+                    {{item}}
                   </span>
                 </div>
-            <div class="userAdress">
-              <span v-if="address.consigneeAddressPath[0]">{{
-                address.consigneeAddressPath[0]
-              }}</span>
-
-              <span v-if="address.consigneeAddressPath[1]">{{
-                address.consigneeAddressPath[1]
-              }}</span>
-              <span v-if="address.consigneeAddressPath[2]">{{
-                address.consigneeAddressPath[2]
-              }}</span>
-
-              <span v-if="address.consigneeAddressPath[3]">{{
-                address.consigneeAddressPath[3]
-              }}</span>
-              <span>
+              </div>
+              <!-- 详细地址 -->
+              <div class="user-address-detail wes-2">
                 {{ address.detail }}
-              </span>
+              </div>
+              <!-- 姓名 手机号 -->
+              <div>
+                <span>{{ address.name }}</span>
+                <span class="mobile">{{ address.mobile | secrecyMobile }}</span>
+              </div>
+            </div>
           </div>
         </div>
-        </u-col>
-        <u-col :span="1" @click.native="
-            navigateTo('/pages/mine/address/address?way=' + routerVal.way)
-          " style="text-align: right">
         <u-icon name="arrow-right" style="color: #bababa"></u-icon>
-        </u-col>
-      </u-row>
       </div>
       <!-- 背景 -->
       <div class="bar"></div>
+    </div>
 
     <!-- 开团信息 -->
     <view class="group-box" v-if="isAssemble">
@@ -52,17 +42,19 @@
       </view>
       <view class="group">
         <view>
-          <u-image borderRadius="50%" shape="square" class="head-img" width="81rpx" height="81rpx" :src="masterWay.face || '/static/missing-face.png'"></u-image>
+          <u-image borderRadius="50%" shape="square" class="head-img" width="81rpx" height="81rpx"
+            :src="masterWay.face || '/static/missing-face.png'"></u-image>
           <view class="btn-one">团长</view>
         </view>
         <view class="line"> </view>
         <view>
           <!-- 如果有最后一名，显示最后一名，没有最后一名，显示等待参团 -->
-          <u-image class="head-img" v-if="endWay.face" :src="endWay.face" borderRadius="50%" shape="square" width="81rpx" height="81rpx">
+          <u-image class="head-img" v-if="endWay.face" :src="endWay.face" borderRadius="50%" shape="square"
+            width="81rpx" height="81rpx">
             <view slot="loading"></view>
           </u-image>
-
-          <u-image class="head-img" borderRadius="50%" shape="square" v-else width="81rpx" height="81rpx" :src="endWay.face || '/static/missing-face.png'"></u-image>
+          <u-image class="head-img" borderRadius="50%" shape="square" v-else width="81rpx" height="81rpx"
+            :src="endWay.face || '/static/missing-face.png'"></u-image>
 
           <view class="wait">{{ endWay.nickname || "等待参团" }}</view>
         </view>
@@ -71,38 +63,30 @@
 
     <!-- 店铺商品信息 -->
     <div class="box box2" v-for="(item, index) in orderMessage.cartList" :key="index">
-      <u-row class="tab1" @click="navigateToStore(item)">
-        <u-col :offset="0">
-          <span class="ybname">{{ item.storeName }}</span>
-        </u-col>
-      </u-row>
-      <div class="promotionNotice">{{ item.promotionNotice }}</div>
-      <u-row class="goodsBorder" v-for="(val, i) in item.skuList" :key="i">
-        <u-col class="tabL" :offset="0" @click="navigateTo('/pages/product/goods?id=' + val.goodsSku.id+'&goodsId='+val.goodsSku.goodsId)" :span="3">
-          <u-image borderRadius="10rpx" :src="val.goodsSku.thumbnail" alt />
-        </u-col>
-        <u-col :span="9" @click="navigateTo('/pages/product/goods?id=' + val.goodsSku.id+'&goodsId='+val.goodsSku.goodsId)" class="tabC">
-          <div style="overflow: hidden">
-            <p class="sp_name">{{ val.goodsSku.goodsName }}</p>
-            <p class="sp_promotion" v-if="val.promotion_tags">
-              <view class="sp_tag sp_tag_plain" v-for="(promotion_item, promotion_index) in val.promotion_tags" :key="promotion_index">{{ promotion_item }}</view>
-            </p>
+      <div @click="navigateToStore(item)">
+        <div class="store-name">
+          <span>{{ item.storeName }}</span>
+        </div>
+      </div>
+      <div class="promotionNotice">{{ item.promotionNotice || '' }}</div>
+      <div class="flex goods-item" v-for="(val, i) in item.skuList" :key="i">
+        <div class="goods-image"
+          @click="navigateTo('/pages/product/goods?id=' + val.goodsSku.id+'&goodsId='+val.goodsSku.goodsId)" :span="3">
+          <u-image borderRadius="10rpx" width="200rpx" height="200rpx" :src="val.goodsSku.thumbnail" alt />
+        </div>
+        <div @click="navigateTo('/pages/product/goods?id=' + val.goodsSku.id+'&goodsId='+val.goodsSku.goodsId)"
+          class="goods-detail">
+          <div class="flex">
+            <p class="goods-name">{{ val.goodsSku.goodsName }}</p>
             <span class="nums">x{{ val.num }}</span>
           </div>
-
-          <p class="sp_number">￥{{ val.goodsSku.price | unitPrice }}</p>
-        </u-col>
-      </u-row>
-
-      <u-row>
-        <u-col :offset="0" :span="4" class="tl" style="text-align: left">备注信息</u-col>
-        <u-col :span="8" textAlign="right">
-          <u-input style="text-align:right;" class="uinput" v-model="remarkVal[index].remark" />
-        </u-col>
-      </u-row>
+          <p class="goods-prices">
+            <span>￥</span>
+            <span class="goods-price">{{formatPrice(val.goodsSku.price)[0]}}</span>
+            <span>.{{formatPrice(val.goodsSku.price)[1] }}</span>
+          </p>
+        </div>
       </div>
-    <!-- 订单信息 -->
-    <div class="box box3">
       <u-row>
         <u-col :offset="0" :span="4">发票信息</u-col>
         <u-col :span="8" class="tipsColor" textAlign="right" @click.native="invoice()">
@@ -110,35 +94,25 @@
           <span v-else>不开发票</span>
         </u-col>
       </u-row>
-    </div>
-
-    <!-- 发票信息 -->
-    <invoices :res="receiptList" @callbackInvoice="callbackInvoice" v-if="invoiceFlag" />
-    <u-select v-model="shippingFlag" :list="shippingMethod" @confirm="checkedshipMethod"></u-select>
-
-    <!-- 优惠券 -->
-    <div class="box box4">
       <u-row>
-        <u-col :offset="0" :span="9" @click="shippingFlag = true">配送方式</u-col>
-        <u-col :span="3" textAlign="right" @click="shippingFlag = true">
+        <u-col v-if="orderMessage.cartTypeEnum != 'VIRTUAL'" :offset="0" :span="9" @click="shippingFlag = true">配送
+        </u-col>
+        <u-col v-if="orderMessage.cartTypeEnum != 'VIRTUAL'" :span="3" textAlign="right" @click="shippingFlag = true">
           {{shippingMethod.find(e=>{  return e.value == shippingText; }).label }}
         </u-col>
       </u-row>
       <u-row>
-        <u-col :offset="0" :span="9" @click="GET_Discount()">优惠券</u-col>
-
-        <u-col :span="3" v-if="orderMessage.priceDetailDTO && orderMessage.priceDetailDTO.couponPrice" textAlign="right" @click="GET_Discount()">
-          <span class="main-color">-{{orderMessage.priceDetailDTO.couponPrice | unitPrice}}</span>
-        </u-col>
-        <!--  orderMessage.priceDetailDTO.couponPrice | unitPrice  -->
-        <u-col :span="3" v-else textAlign="right" @click="GET_Discount()">
-          {{ couponNums || "0" }}张可用
-          <u-icon name="arrow-right"></u-icon>
+        <u-col :offset="0" :span="4" class="tl" style="text-align: left">备注信息</u-col>
+        <u-col :span="8" textAlign="right">
+          <u-input style="text-align:right;" class="uinput" v-model="remarkVal[index].remark" />
         </u-col>
       </u-row>
-
     </div>
 
+    <!-- 发票信息 -->
+    <invoices :res="receiptList" @callbackInvoice="callbackInvoice" v-if="invoiceFlag" />
+    <u-select v-model="shippingFlag" :list="shippingMethod"></u-select>
+
     <div class="box box5" v-if="orderMessage.priceDetailDTO">
       <div>
         <u-row>
@@ -150,51 +124,73 @@
       </div>
       <div>
         <u-row>
-          <u-col :span="7">运费</u-col>
-          <u-col :span="5" class="tr tipsColor" textAlign="right">
-            <u-tag v-if="orderMessage.priceDetailDTO.freightPrice == 0" style="margin-right: 20rpx" color="#FF6262" text="包邮" type="warning" size="mini" mode="plain" shape="circle" />
-            <span>￥{{
+          <u-col v-if="orderMessage.cartTypeEnum != 'VIRTUAL'" :span="7">运费</u-col>
+          <u-col v-if="orderMessage.cartTypeEnum != 'VIRTUAL'" :span="5" class="tr tipsColor" textAlign="right">
+            <span v-if="orderMessage.priceDetailDTO.freightPrice == 0">包邮</span>
+            <span v-else>￥{{
                 orderMessage.priceDetailDTO.freightPrice | unitPrice
               }}</span>
           </u-col>
         </u-row>
       </div>
+      <u-row>
+        <u-col :offset="0" :span="9" @click="GET_Discount()">优惠券</u-col>
 
+        <u-col :span="3" v-if="orderMessage.priceDetailDTO && orderMessage.priceDetailDTO.couponPrice" textAlign="right"
+          @click="GET_Discount()">
+          <span class="main-color">-￥{{orderMessage.priceDetailDTO.couponPrice | unitPrice}}</span>
+        </u-col>
+        <!--  orderMessage.priceDetailDTO.couponPrice | unitPrice  -->
+        <u-col :span="3" v-else textAlign="right" @click="GET_Discount()">
+          {{ orderMessage.canUseCoupons.length || "0" }} 张可用
+          <u-icon name="arrow-right"></u-icon>
+        </u-col>
+      </u-row>
       <div>
         <u-row>
           <u-col :span="9">优惠金额</u-col>
-          <u-col :span="3" textAlign="right">-￥{{ orderMessage.priceDetailDTO.couponPrice | unitPrice }}</u-col>
+          <u-col :span="3" textAlign="right" v-if=" orderMessage.priceDetailDTO.couponPrice">
+            -￥{{ orderMessage.priceDetailDTO.couponPrice | unitPrice }}</u-col>
+          <u-col :span="3" textAlign="right" v-else>0.00</u-col>
         </u-row>
       </div>
       <div>
         <u-row>
           <u-col :span="6">活动优惠</u-col>
           <u-col :span="6" class="tr tipsColor" textAlign="right">
-            <u-tag style="margin-right: 20rpx" v-if="orderMessage.priceDetailDTO.discountPrice != 0" color="#FF6262" :text="`优惠 ${orderMessage.priceDetailDTO.discountPrice} 元`" type="warning"
-              size="mini" mode="plain" shape="circle" />
-            <span>{{
-              orderMessage.priceDetailDTO.discountPrice | unitPrice
-            }}</span>
+            <span
+              v-if="orderMessage.priceDetailDTO.discountPrice">-￥{{orderMessage.priceDetailDTO.discountPrice | unitPrice}}</span>
+            <span v-else>0.00</span>
           </u-col>
         </u-row>
       </div>
+
+    </div>
+
+    <!-- 配送地区没有提示 -->
+    <div class="notSupportFreight" v-if="notSupportFreight.length !=0">
+      <u-notice-bar style="width:100%" :volume-icon="false" mode="horizontal" :list="notSupportFreightGoodsList">
+      </u-notice-bar>
     </div>
 
     <!-- 结账 -->
-    <div class="box box6 mp-iphonex-bottom" v-if="orderMessage.priceDetailDTO">
-      <div class="navL">
-        合计：
-        <span class="number">
-          ¥
-          <span>{{ orderMessage.priceDetailDTO.billPrice | unitPrice }}</span>
-        </span>
+
+    <div class="box6 mp-iphonex-bottom" v-if="orderMessage.priceDetailDTO">
+      <div class="tabbar-left">
+        <div v-if="!orderMessage.priceDetailDTO.payPoint" class="number">
+          <span>¥</span>
+          <span class="price">{{ formatPrice(orderMessage.priceDetailDTO.flowPrice)[0] }}</span>
+          <span>.{{formatPrice(orderMessage.priceDetailDTO.flowPrice)[1] }} </span>
+        </div>
+        <span v-else class="number"><span
+            style="margin-right:10rpx;">{{orderMessage.priceDetailDTO.payPoint | unitPrice }}</span>积分</span>
       </div>
       <div class="navRiv" @click="createTradeFun()">
         <!-- #ifndef MP-WEIXIN -->
-        <div class="navR">提交订单</div>
+        <div class="tabbar-right">提交订单</div>
         <!-- #endif -->
         <!-- #ifdef MP-WEIXIN -->
-        <div class="navR">微信支付</div>
+        <div class="tabbar-right">微信支付</div>
         <!-- #endif -->
 
       </div>
@@ -249,10 +245,11 @@ export default {
       endWay: "", //最后一个参团人
       masterWay: "", //团长信息
       pintuanFlage: true, //是开团还是拼团
+      notSupportFreight: [], //不支持运费
+      notSupportFreightGoodsList: ["以下商品超出配送范围："],
     };
   },
   filters: {
-
     /**
      * 发票收据类型
      */
@@ -316,6 +313,13 @@ export default {
   mounted() {},
 
   methods: {
+    // 格式化金钱  1999 --> [1999,00]
+    formatPrice(val) {
+      if (typeof val == "undefined") {
+        return val;
+      }
+      return val.toFixed(2).split(".");
+    },
     //发票回调 选择发票之后刷新购物车
     async callbackInvoice(val) {
       this.invoiceFlag = false;
@@ -403,7 +407,11 @@ export default {
     /**
      * 提交订单准备支付
      */
-    submit() {
+
+    // 创建订单
+    createTradeFun() {
+      // 防抖
+      this.$u.throttle(() => {
         if (!this.address.id) {
           uni.showToast({
             title: "请选择地址",
@@ -445,7 +453,12 @@ export default {
               duration: 2000,
               icon: "none",
             });
-
+            // 如果当前价格为0跳转到订单列表
+            if (this.orderMessage.priceDetailDTO.billPrice == 0) {
+              uni.redirectTo({
+                url: "/pages/order/myOrder?status=0",
+              });
+            } else {
               // #ifdef MP-WEIXIN
               // 微信小程序中点击创建订单直接开始支付
               this.pay(res.data.result.sn);
@@ -456,20 +469,16 @@ export default {
                 `/pages/cart/payment/payOrder?trade_sn=${res.data.result.sn}`
               );
               // #endif
+            }
           } else {
             uni.showToast({
-            title: "创建订单有误!请稍后重试",
+              title: res.data.message,
               duration: 2000,
               icon: "none",
             });
           }
         });
-    },
-
-    // 创建订单
-    createTradeFun() {
-      // 防抖
-      this.$u.debounce(this.submit(), 3000);
+      }, 3000);
     },
 
     /**
@@ -489,9 +498,8 @@ export default {
       // 如果没有商品选择地址的话 则选择 默认地址
       API_Address.getAddressDefault().then((res) => {
         if (res.data.result) {
-          res.data.result.consigneeAddressPath = res.data.result.consigneeAddressPath.split(
-            ","
-          );
+          res.data.result.consigneeAddressPath =
+            res.data.result.consigneeAddressPath.split(",");
           this.address = res.data.result;
         }
       });
@@ -499,8 +507,6 @@ export default {
 
     // 获取结算参数
     getOrderList() {
-      // 获取购物车可用优惠券
-      this.getCartsCouponNums();
       // 获取结算参数
       API_Trade.getCheckoutParams(this.routerVal.way).then((res) => {
         res.data.result.cartList.forEach((item, index) => {
@@ -510,24 +516,31 @@ export default {
           };
         });
         this.orderMessage = res.data.result;
+        /**
+         * 为了避免路径传值在h5中超出限制问题
+         * 这块将可用的优惠券以及不可用的优惠券放入到vuex里面进行存储
+         */
+        this.$store.state.canUseCoupons = res.data.result.canUseCoupons;
+        this.$store.state.cantUseCoupons = res.data.result.cantUseCoupons;
 
         if (!res.data.result.memberAddress.id) {
           // 获取会员默认地址
           this.getUserAddress();
         } else {
           this.address = res.data.result.memberAddress;
-          res.data.result.memberAddress.consigneeAddressPath = res.data.result.memberAddress.consigneeAddressPath.split(
-            ","
-          );
+          res.data.result.memberAddress.consigneeAddressPath =
+            res.data.result.memberAddress.consigneeAddressPath.split(",");
         }
-      });
-    },
 
-    /**购物车可用优惠券 */
-    getCartsCouponNums() {
-      API_Trade.getCartCouponNum(this.routerVal.way).then((res) => {
-        if (res.data.success) {
-          this.couponNums = res.data.result;
+        if (
+          res.data.result.notSupportFreight &&
+          res.data.result.notSupportFreight.length != 0
+        ) {
+          this.notSupportFreight = res.data.result.notSupportFreight;
+
+          res.data.result.notSupportFreight.forEach((item) => {
+            this.notSupportFreightGoodsList[0] += item.goodsSku.goodsName;
+          });
         }
       });
     },
@@ -536,7 +549,16 @@ export default {
   },
 };
 </script>
+<style scoped>
+page {
+  background: #ededed !important;
+}
+</style>
 <style scoped lang="scss">
+.flex-8 {
+  flex: 8;
+}
+
 .main-color {
   font-weight: bold;
 }
@@ -547,12 +569,13 @@ export default {
 }
 .promotionNotice {
   font-size: 24rpx;
+  margin: 20rpx 0;
   color: $aider-light-color;
 }
 .nums {
+  flex: 2;
   color: $light-color;
-  float: right;
-  width: 15%;
+ 
   text-align: center;
 }
 .wait {
@@ -570,6 +593,9 @@ export default {
   width: 143rpx;
   border-bottom: 2px dotted #999;
 }
+.tabbar-left {
+  margin-left: 32rpx;
+}
 
 .btn-one,
 .wait {
@@ -598,11 +624,8 @@ export default {
 
 .group-title {
   text-align: center;
-
   font-size: 28rpx;
-  font-family: PingFang SC, PingFang SC-Regular;
   font-weight: 400;
-
   color: $light-color;
 }
 
@@ -618,7 +641,6 @@ export default {
 
 .group {
   width: 100%;
-
   display: flex;
   align-items: center;
   justify-content: center;
@@ -639,62 +661,51 @@ export default {
   height: 4rpx;
   overflow: hidden;
   width: 100%;
-  background: url("/pages/floor/imgs/line.png") no-repeat;
-}
-
-.tabC {
-  > p {
-    overflow: hidden;
-
-    text-overflow: ellipsis;
-
-    white-space: nowrap;
-  }
+  background: url("@/pages/order/imgs/line.png") no-repeat;
 }
 
 .box2 {
   margin-top: 20rpx;
 }
+.notSupportFreight {
+  position: fixed;
 
-.userClass {
-  font-weight: bold;
-  font-size: 32rpx;
-  color: $u-content-color;
-  > span {
-    margin-left: 20rpx;
+  bottom: calc(100rpx + env(safe-area-inset-bottom));
+  // #ifdef H5
+  bottom: 100rpx;
+  // #endif
+  display: flex;
+  align-items: center;
+  left: 0;
+  background: #fdf6ec;
+  height: 100rpx;
+  width: 100%;
+  transition: 0.35s;
+
+  > .tips {
+    margin: 0 32rpx;
   }
 }
-
-.userAdress {
-  margin: 20rpx 0;
-  color: $u-tips-color;
-  font-size: 26rpx;
+/deep/ .u-notice-bar-wrap {
+  width: 100% !important;
 }
 
 .box6 {
   position: fixed;
   bottom: 0;
   left: 0;
-
-  margin: 0;
+  width: 100%;
   height: 100rpx;
   overflow: hidden;
   line-height: 100rpx;
   margin-bottom: 0px !important;
   background: #fff;
   color: #333;
-  width: 100%;
-
-  > .navL {
-    width: 65%;
+  display: flex;
+  justify-content: space-between;
 }
 
-  > .navRiv {
-    float: left;
-  }
-}
-
-.navR {
+.tabbar-right {
   margin-top: 10rpx;
   height: 80rpx;
   color: #fff;
@@ -703,6 +714,7 @@ export default {
   padding: 0 44rpx;
   text-align: center;
   border-radius: 400px;
+  margin-right: 32rpx;
 }
 
 .sp_tag {
@@ -716,7 +728,7 @@ export default {
   border-radius: 0.4em;
 }
 
-.sp_promotion {
+.goods-promotion {
   float: left;
   width: 75%;
   margin: 4rpx 0;
@@ -736,15 +748,9 @@ export default {
   margin-left: 0;
 }
 
-.sp_name {
-  float: left;
-  width: 75%;
+.goods-name {
+  flex: 8;
   font-size: 28rpx;
-  overflow: hidden;
-
-  text-overflow: ellipsis;
-
-  white-space: nowrap;
 }
 
 .sp_type {
@@ -756,28 +762,21 @@ export default {
 .number {
   color: $main-color;
   font-size: 26rpx;
-  margin-left: 10rpx;
-
+  font-weight: bold;
   > span {
     font-size: 36rpx;
   }
 }
 
-.sp_number {
-  color: $light-color;
+.goods-prices {
+  margin: 10rpx 0;
+  color: $main-color;
   font-size: 28rpx;
+  font-weight: bold;
+  > .goods-price {
+    font-size: 38rpx;
+    padding: 0 2rpx;
   }
-
-.box1 {
-  background: #f6f6f6 !important;
-  min-height: 166rpx;
-  // height: 200rpx;
-
-  /deep/ .u-row {
-    border: none;
-  }
-
-  margin-bottom: 0 !important;
 }
 
 .box {
@@ -785,26 +784,19 @@ export default {
   overflow: hidden;
   background: #fff;
   margin-bottom: 20rpx;
+  color: #666;
   padding: 0 32rpx;
 }
 
-.navL,
-.navR {
-  float: left;
-}
-
 .wrapper {
-  background: #f9f9f9;
   height: auto;
+  background: #f7f7f7;
   padding-bottom: 200rpx;
   overflow: auto !important;
 }
 
-.tab1 {
-}
-
-.ybname {
-  margin-left: 20rpx;
+.store-name {
+  margin-top: 32rpx;
   font-weight: 400;
   color: #333333;
 }
@@ -815,18 +807,67 @@ export default {
 
 /deep/ .u-col-3,
 .tipsColor {
-  color: $u-tips-color;
+  color: #333;
 }
 
-.tabL {
+.goods-image {
   text-align: left;
   overflow: hidden;
-
-  /deep/ .u-image,
-  .u-image__image {
-    width: 132rpx !important;
-    height: 132rpx !important;
-    border-radius: 0.4em !important;
 }
+.default {
+  background: $main-color;
+  font-size: 24rpx;
+  border-radius: 8rpx;
+  padding: 0rpx 12rpx;
+  color: #fff;
+}
+.address-box {
+  border-radius: 40rpx;
+  border-top-left-radius: 0 !important;
+  border-top-right-radius: 0 !important;
+  overflow: hidden;
+  background: #fff;
+  margin-bottom: 20rpx;
+  color: #666;
+}
+.address-list {
+  margin-left: 20rpx;
+}
+.address-item {
+  font-weight: normal;
+  letter-spacing: 1rpx;
+}
+.user-box {
+  padding: 32rpx;
+}
+.user-address-detail {
+  color: #333;
+  font-size: 38rpx;
+  font-weight: bold;
+  margin: 20rpx 0;
+  letter-spacing: 1rpx;
+}
+.mobile {
+  margin-left: 20rpx;
+}
+.price {
+  font-size: 50rpx !important;
+  margin: 0 2rpx;
+}
+.goods-detail {
+  display: flex;
+  flex-direction: column;
+
+  justify-content: center;
+  flex: 8;
+  margin-left: 20rpx !important;
+  > p {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+}
+.goods-item {
+  margin: 20rpx 0;
 }
 </style>

pages/order/invoice/invoiceDetail.vue

@@ -79,7 +79,11 @@ export default {
           },
         });
       } else {
-        this.$api.msg("暂无发票可预览");
+        uni.showToast({
+          title: "暂无发票可预览",
+          duration: 2000,
+          icon: "none",
+        });
       }
     },
     download() {
@@ -95,7 +99,11 @@ export default {
                 uni.saveFile({
                   tempFilePath: tempFilePath,
                   success: function (res) {
-                    _this.$api.msg("发票已下载到" + res.savedFilePath);
+                    uni.showToast({
+                      title: "发票已下载到" + res.savedFilePath,
+                      duration: 2000,
+                      icon: "none",
+                    });
                   },
                 });
               }
@@ -103,7 +111,11 @@ export default {
           });
         });
       } else {
-        this.$api.msg("暂无发票可下载");
+        uni.showToast({
+          title: "暂无发票可下载",
+          duration: 2000,
+          icon: "none",
+        });
       }
     },
   },
@@ -193,13 +205,6 @@ export default {
   }
 }
 
-.btn {
-  font-size: 34rpx;
-  margin: 60rpx 20rpx;
-  &::after {
-    border: none;
-  }
-}
 .u-cell {
   padding: 35rpx 20rpx;
   height: 110rpx;

pages/order/myOrder.vue

@@ -7,7 +7,7 @@
       <swiper-item class="tab-content" v-for="(tabItem, tabIndex) in navList" :key="tabIndex">
         <scroll-view class="list-scroll-content" scroll-y @scrolltolower="loadData(tabIndex)">
           <!-- 空白页 -->
-          <empty v-if="tabItem.loaded === true && tabItem.orderList.length === 0"></empty>
+          <u-empty text="暂无订单" mode="list" v-if="tabItem.loaded === true && tabItem.orderList.length === 0"></u-empty>
           <!-- 订单列表 -->
           <view class="seller-view" :key="oderIndex" v-for="(order, oderIndex) in tabItem.orderList">
             <!-- 店铺名称 -->
@@ -39,9 +39,9 @@
               <view class="btn-view u-flex u-row-between">
                 <view class="description">
                   <!-- 等待付款 -->
-                  <text v-if="order.payStatus === 'PAID'">已付金额：</text>
-                  <text v-else>应付金额：</text>
-                  <text class="price">￥{{ order.flowPrice | unitPrice }}</text>
+                  <div v-if="order.payStatus === 'PAID'">已付金额:</div>
+                  <div v-else>应付金额:</div>
+                  <div class="price">￥{{ order.flowPrice | unitPrice }}</div>
                 </view>
                 <view>
                   <!-- 全部 -->
@@ -57,20 +57,20 @@
                   <u-button ripple :customStyle="{'background':lightColor,'color':'#fff' }" shape="circle" class="pay-btn" size="mini" v-if="order.allowOperationVO.rog" @click="onRog(order.sn)">
                     确认收货
                   </u-button>
-                  <u-button ripple shape="circle" class="rebuy-btn" size="mini" v-if="
+                  <u-button ripple shape="circle" class="cancel-btn" size="mini" v-if="order.groupAfterSaleStatus=='NOT_APPLIED'" @click="applyService(order)">
+                    退款/售后
+                  </u-button>
+                  <!-- TODO 后续完善 -->
+                  <!-- <u-button ripple shape="circle" class="rebuy-btn" size="mini" v-if="
                       order.orderStatus === 'CANCELLED' ||
                       order.orderStatus === 'COMPLETE'
                     " @click="reBuy(order)">
                     再次购买
-                  </u-button>
+                  </u-button> -->
                 </view>
               </view>
             </view>
           </view>
-          <view class="nodata" v-if="tabItem.loadStatus === 'noMore'">
-
-          </view>
-
           <uni-load-more :status="tabItem.loadStatus"></uni-load-more>
         </scroll-view>
       </swiper-item>
@@ -100,14 +100,12 @@
 
 <script>
 import uniLoadMore from "@/components/uni-load-more/uni-load-more.vue";
-import empty from "@/components/empty";
 import { getOrderList, cancelOrder, confirmReceipt } from "@/api/order.js";
 import { getClearReason } from "@/api/after-sale.js";
 import LiLiWXPay from "@/js_sdk/lili-pay/wx-pay.js";
 export default {
   components: {
     uniLoadMore,
-    empty,
   },
   data() {
     return {
@@ -208,6 +206,8 @@ export default {
     this.loadData(this.status);
   },
 
+  
+
   onLoad(options) {
     /**
      * 修复app端点击除全部订单外的按钮进入时不加载数据的问题
@@ -219,6 +219,7 @@ export default {
     if (status == 0) {
       this.loadData(status);
     }
+  
   },
 
   watch: {
@@ -235,6 +236,18 @@ export default {
     },
   },
   methods: {
+
+
+    // 售后
+    applyService(order){
+      
+      
+      uni.navigateTo({
+         url: `/pages/order/afterSales/afterSales?orderSn=${order.sn}`
+      });
+
+    },
+
     // 店铺详情
     navigateToStore(val) {
       uni.navigateTo({
@@ -314,9 +327,8 @@ export default {
           this.navList[index].loadStatus = "noMore";
         }
         if (orderList.length > 0) {
-          this.navList[index].orderList = this.navList[index].orderList.concat(
-            orderList
-          );
+          this.navList[index].orderList =
+            this.navList[index].orderList.concat(orderList);
           this.navList[index].pageNumber += 1;
         }
       });
@@ -463,12 +475,11 @@ export default {
      * 重新购买
      */
     reBuy(order) {
+      console.log(order);
+      return;
       uni.navigateTo({
         url:
-          "/pages/product/goods?id=" +
-          order.groupSkuId +
-          "&goodsId=" +
-          order.goodsId,
+          "/pages/product/goods?id=" + order.id + "&goodsId=" + order.goodsId,
       });
     },
 
@@ -494,6 +505,9 @@ page,
 
 .swiper-box {
   height: calc(100vh - 40px);
+  // #ifdef H5
+  height: calc(100vh - 40px - 44px);
+  // #endif
 }
 
 .list-scroll-content {
@@ -613,9 +627,10 @@ page,
     font-size: 26rpx;
 
     .description {
+      display: flex;
       color: #909399;
-      size: 25rpx;
-
+      size: 24rpx;
+      flex: 1;
       .price {
         color: $main-color;
       }
@@ -676,15 +691,4 @@ page,
   margin-left: 15rpx;
   height: 60rpx;
 }
-
-.nodata {
-  // padding-top: 300rpx;
-  color: #999999;
-  text-align: center;
-
-  img {
-    width: 346rpx;
-    height: 304rpx;
-  }
-}
 </style>

pages/order/orderDetail.vue

@@ -20,8 +20,11 @@
       </view>
 
       <view class="logi-List" v-else>
-        <view class="logi-List-title">
-          暂无物流信息
+        <view class="verificationCode" v-if="order.verificationCode ">
+          券码： {{order.verificationCode}}
+        </view>
+        <view v-else class="logi-List-title">
+          {{'暂无物流信息'}}
         </view>
       </view>
 
@@ -101,7 +104,8 @@
       </view>
     </view>
     <!-- 客户服务， 售后，取消订单，查看物流，投诉等 -->
-    <view class="info-view" v-if="orderDetail.allowOperationVO && orderDetail.allowOperationVO.cancel == true || order.orderStatus == 'DELIVERED' || order.orderStatus != 'UNPAID' && order.orderType =='PINTUAN'">
+    <view class="info-view"
+      v-if="orderDetail.allowOperationVO && orderDetail.allowOperationVO.cancel == true || order.orderStatus == 'DELIVERED' || order.orderStatus != 'UNPAID' && order.orderPromotionType =='PINTUAN'">
       <view style="width: 100%">
         <view class="order-info-view">
           <view class="title">服务</view>
@@ -109,7 +113,7 @@
         <view class="customer-list">
           <view class="customer-service" v-if="orderDetail.allowOperationVO && orderDetail.allowOperationVO.cancel == true" @click="onCancel(order.sn)">取消订单</view>
           <view class="customer-service" v-if="order.orderStatus == 'DELIVERED'" @click="onLogistics(order)">查看物流</view>
-          <view class="customer-service" v-if="order.orderStatus != 'UNPAID' && order.orderType =='PINTUAN' " @click="ByUserMessage(order)">查看拼团信息</view>
+          <view class="customer-service" v-if="order.orderStatus != 'UNPAID' && order.orderPromotionType =='PINTUAN' " @click="ByUserMessage(order)">查看拼团信息</view>
         </view>
       </view>
     </view>
@@ -200,7 +204,7 @@
       </view>
     </u-popup>
     <u-toast ref="uToast" />
-    <u-modal v-model="rogShow" :show-cancel-button="true" :content="'是否确认收货?'" @confirm="confirmRog"></u-modal>
+    <u-modal v-model="rogShow" :show-cancel-button="true" :content="'是否确认收货?'" :confirm-color="lightColor" @confirm="confirmRog"></u-modal>
 
     <!-- 分享 -->
     <shares v-if="shareFlage " :thumbnail="orderDetail.orderItems[0].image" :goodsName="orderDetail.orderItems[0].goodsName" @close="shareFlage = false" />
@@ -252,7 +256,7 @@ export default {
           value: "订单已完成,祝您生活愉快",
         },
         TAKE: {
-          title: "带核验",
+          title: "待核验",
         },
       },
       order: {},
@@ -359,7 +363,6 @@ export default {
      * 投诉
      */
     complaint(sku) {
-     
       uni.navigateTo({
         url:
           "/pages/order/complain/complain?sn=" +
@@ -378,7 +381,6 @@ export default {
     },
     // 去支付
     toPay(val) {
-    
       val.sn
         ? uni.navigateTo({
             url: "/pages/cart/payment/payOrder?order_sn=" + val.sn,
@@ -445,12 +447,13 @@ export default {
     confirmRog() {
       confirmReceipt(this.orderSn).then((res) => {
         if (res.data.success) {
-          this.$refs.uToast.show({
+          uni.showToast({
             title: "已确认收货",
-            type: "success",
+            duration: 2000,
+            icon: "none",
           });
           this.rogShow = false;
-          this.loadData(options.sn);
+          this.loadData(this.sn);
         }
       });
     },
@@ -651,7 +654,10 @@ page,
     }
   }
 }
-
+.verificationCode {
+  font-weight: bold;
+  letter-spacing: 2rpx;
+}
 .bottom_view {
   width: 100%;
   height: 100rpx;

pages/passport/codeLogin.vue

@@ -6,15 +6,17 @@
       </u-form-item>
 
       <u-form-item class="cell code" label-width="120" prop="code" label="验证码">
-        <div style="display:flex; with:100%;">
-          <u-input v-model="codeForm.code" placeholder="请输入验证码" />
-          <u-verification-code keep-running unique-key="page-login" :seconds="seconds" @end="end" @start="start" ref="uCode" @change="codeChange"></u-verification-code>
-          <view @tap="getCode" class="text-tips">{{ tips }}</view>
+        <div style="display:flex; width:100%;">
+          <u-input maxlength="6" v-model="codeForm.code" placeholder="请输入验证码" />
+          <u-verification-code keep-running unique-key="page-login" :seconds="seconds" @end="end" @start="start"
+            ref="uCode" @change="codeChange"></u-verification-code>
+          <view @tap="getCode" :style="{color:aiderLightColor}" class="text-tips">{{ tips }}</view>
+
         </div>
       </u-form-item>
 
-      <view class="submit" @click="submit">登录</view>
-      <view class="text-tips cell" @click="clickLogin">一键登录</view>
+      <view class="submit bg-linear-gradient" @click="submit">登录</view>
+      <view :style="{color:aiderLightColor}" class="text-tips cell" @click="clickLogin">一键登录</view>
       <myVerification v-if="codeFlag" @send="verification" class="verification" ref="verification" business="LOGIN" />
     </u-form>
   </div>
@@ -34,6 +36,7 @@ export default {
   props: ["status"], //是否勾选 《用户隐私》和《隐私政策》
   data() {
     return {
+      aiderLightColor: this.$aiderLightColor,
       uuid,
       flage: false, //是否验证码验证
       codeFlag: true, //验证开关，用于是否展示验证码
@@ -79,18 +82,21 @@ export default {
     this.clientType = "H5";
     //#endif
     //#ifdef APP-PLUS
+
     this.clientType = "APP";
     //#endif
   },
   watch: {
-    flage(val) {
+    async flage(val) {
       if (val) {
         if (this.$refs.uCode.canGetCode) {
           // 向后端请求验证码
           uni.showLoading({
             title: "正在获取验证码",
           });
-          sendMobile(this.codeForm.mobile).then((res) => {
+
+          let res = await sendMobile(this.codeForm.mobile);
+
           uni.hideLoading();
           // 这里此提示会被this.start()方法中的提示覆盖
           if (res.data.success) {
@@ -101,11 +107,13 @@ export default {
               duration: 2000,
               icon: "none",
             });
+            this.flage = false;
           }
-          });
         } else {
           this.$u.toast("请倒计时结束后再发送");
         }
+      } else {
+        this.$refs.verification.hide();
       }
     },
   },
@@ -184,6 +192,7 @@ export default {
     // 跳转到一键登录
     clickLogin() {
       this.$emit("open", "click");
+      
     },
 
     /**点击验证码*/
@@ -205,15 +214,17 @@ export default {
           uni.hideLoading();
         }, 2000);
       }
+
       if (!this.$u.test.mobile(this.codeForm.mobile)) {
         uni.showToast({
           title: "请输入正确手机号",
           icon: "none",
         });
+
         return false;
       }
       if (!this.flage) {
-        this.$refs.verification.hide();
+        this.$refs.verification.error();
         return false;
       }
     },

pages/passport/login.scss

@@ -6,7 +6,6 @@
 	margin: 40rpx 0;
 }
 .login-ball {
-	background-image: linear-gradient(25deg, #fa123b, #ff6b35, #ff9f28, #ffcc03);
 	border-bottom-left-radius: 300rpx;
 	height: 400rpx;
 	position: relative;
@@ -43,25 +42,22 @@ span {
 .submit {
 	height: 80rpx;
 	line-height: 80rpx;
-
-	background-image: linear-gradient(90deg, #ff6b35, #ff9f28, #ffcc03);
 	color: #fff;
 	text-align: center;
 	font-size: 30rpx;
 	border-radius: 100px;
 }
 .logo {
+	margin-top: 20rpx;
 	width: 200rpx;
 	height: 200rpx;
 	text-align: center;
-	transform: scale(2.5);
 }
 .logo-cell {
 	text-align: center;
 }
 .text-tips {
 	text-align: center;
-	color: #ff9f28;
 }
 .tips {
 	position: absolute;

pages/passport/login.vue

@@ -1,12 +1,14 @@
 <template>
-  <view v-if="mpWechatLogin">
+  <view>
+    <!--  -->
+    <view v-if="codeLogin">
       <!-- 背景 -->
-    <view class="login-ball small"></view>
+      <view class="login-ball bg-linear-gradient small"></view>
 
       <view class="logo-cell">
-      <image class="logo" src="/static/logo.png" mode="aspectFit"></image>
+        <image class="logo" :src="config.logo" mode="aspectFit"></image>
       </view>
-    <view class="title">LiLi商城</view>
+      <view class="title">{{config.name}}</view>
 
       <!-- 验证码登录 -->
       <codeLogin @open="open" :status="value" v-if="login && loginData.code" />
@@ -17,12 +19,16 @@
       <!-- 隐私政策 -->
       <div class="privacy">
         <u-checkbox-group :icon-size="24" width="45rpx">
-        <u-checkbox v-model="value" active-color="rgb(255, 107, 53)"></u-checkbox>
+          <u-checkbox v-model="value" :active-color="lightColor"></u-checkbox>
 
         </u-checkbox-group>
         同意<span @click="handleClick('user')">《用户协议》</span>和<span @click="handleClick('privacy')">《隐私政策》</span>
       </div>
     </view>
+    <view v-if="wechatLogin">
+      <wechatH5Login />
+    </view>
+  </view>
 </template>
 <script>
 import codeLogin from "./codeLogin";
@@ -31,25 +37,10 @@ import { getUserInfo } from "@/api/members";
 import storage from "@/utils/storage.js";
 import { loginCallback } from "@/api/connect.js";
 import { webConnect } from "@/api/connect.js";
+import config from "@/config/config";
+import wechatH5Login from "./wechatH5Login.vue";
 export default {
   onShow() {
-    // #ifdef MP-WEIXIN
-    this.mpWechatLogin = false;
-    if (this.$options.filters.isLogin("auth")) {
-      getCurrentPages().length > 1
-        ? uni.navigateBack({
-            delta: getCurrentPages().length - 2,
-          })
-        : uni.switchTab({
-            url: "/pages/tabbar/home/index",
-          });
-    } else {
-      uni.navigateTo({
-        url: "/pages/passport/wechatMPLogin",
-      });
-    }
-    // #endif
-
     //#ifdef H5
     let isWXBrowser = /micromessenger/i.test(navigator.userAgent);
     if (isWXBrowser) {
@@ -64,7 +55,10 @@ export default {
   },
   data() {
     return {
-      mpWechatLogin: true, //是否加载微信登录
+      config,
+      lightColor: this.$lightColor,
+      wechatLogin: false, //是否加载微信公众号登录
+      codeLogin: false, //是否加载正常验证码登录
       value: true, //隐私政策
       loginData: {
         code: true, //验证码登录
@@ -77,6 +71,23 @@ export default {
   components: {
     codeLogin,
     onClickLogin,
+    wechatH5Login,
+  },
+  mounted() {
+    // #ifndef APP-PLUS
+    //判断是否微信浏览器
+    var ua = window.navigator.userAgent.toLowerCase();
+    if (ua.match(/MicroMessenger/i) == "micromessenger") {
+      this.wechatLogin = true;
+      return;
+  
+    } else {
+      this.codeLogin = true;
+    }
+    // #endif
+    // #ifdef APP-PLUS
+    this.codeLogin = true;
+    // #endif
   },
 
   onLoad(options) {
@@ -100,7 +111,6 @@ export default {
     //联合信息返回登录
     stateLogin(state) {
       loginCallback(state).then((res) => {
-      
         let data = res.data;
         if (data.success) {
           storage.setAccessToken(data.result.accessToken);

pages/passport/mp-codeLogin.scss

@@ -1,5 +1,4 @@
-.verification {
-}
+
 /deep/ .u-form-item {
 	margin: 40rpx 0 !important;
 	padding: 40rpx 0 !important;

pages/passport/onClickLogin.vue

@@ -3,34 +3,37 @@
     <u-form ref="validateCodeForm">
       <div class="login-list">
         <!-- 循环出当前可使用的第三方登录模式 -->
-        <div class="login-item" v-for="(item,index) in loginList" :key="index">
-          <u-icon :color="item.color" size="80" :name="item.icon" @click="navigateLogin(item)"></u-icon>
-          <div>{{item.title}}</div>
+        <div :style="{background:item.color}" class="login-item" v-for="(item,index) in loginList" :key="index">
+          <u-icon v-if="item.title!='APPLE'" color="#fff" size="42" :name="item.icon" @click="navigateLogin(item)"></u-icon>
+           <u-image v-else src="/static/appleidButton@2x.png" :lazy-load="false" @click="navigateLogin(item)" width="80" height="80" />
         </div>
       </div>
-      <view class="text-tips cell" @click="clickCodeLogin">账号密码登录</view>
+
+      <view :style="{color:aiderLightColor}" class="text-tips cell" @click="clickCodeLogin">账号密码登录</view>
     </u-form>
   </div>
 </template>
 
 <script>
-import { webConnect, openIdLogin } from "@/api/connect.js";
+import { openIdLogin } from "@/api/connect.js";
 import { whetherNavigate } from "@/utils/Foundation"; //登录跳转
 import { getUserInfo } from "@/api/members";
 import storage from "@/utils/storage.js";
+import api from "@/config/api.js";
 
 export default {
   data() {
     return {
+      aiderLightColor: this.$aiderLightColor,
       loginList: [
         {
-          icon: "weixin-circle-fill",
+          icon: "weixin-fill",
           color: "#00a327",
           title: "微信",
           code: "WECHAT",
         },
         {
-          icon: "qq-circle-fill",
+          icon: "qq-fill",
           color: "#38ace9",
           title: "QQ",
           code: "QQ",
@@ -127,9 +130,9 @@ export default {
           });
         } else {
           uni.showToast({
-            title: '配置有误请联系管理员',
+            title: "配置有误请联系管理员",
             duration: 2000,
-            icon:"none"
+            icon: "none",
           });
         }
       });
@@ -148,12 +151,8 @@ export default {
 
       // #ifdef H5
       let code = connectLogin.code;
-      webConnect(code).then((res) => {
-        let data = res.data;
-        if (data.success) {
-          window.location = data.result;
-        }
-      });
+      let buyer = api.buyer;
+      window.open(buyer + `/connect/login/web/` + code, "_self");
       // #endif
       // #ifdef APP-PLUS
       this.nonH5OpenId(connectLogin);
@@ -244,10 +243,25 @@ export default {
           });
           // 执行登录
           getUserInfo().then((user) => {
+            if (user.data.success) {
+              /**
+               * 个人信息存储到缓存userInfo中
+               */
               storage.setUserInfo(user.data.result);
               storage.setHasLogin(true);
+
+              /**
+               * 计算出当前router路径
+               * 1.如果跳转的链接为登录页面或跳转的链接为空页面。则会重新跳转到首页
+               * 2.都不满足返回跳转页面
+               */
+              whetherNavigate();
+            } else {
+              uni.switchTab({
+                url: "/pages/tabbar/home/index",
+              });
+            }
           });
-          whetherNavigate()
         }
       });
     },
@@ -263,22 +277,20 @@ export default {
 <style lang="scss" scoped>
 @import url("./login.scss");
 
-.submit {
-  margin: 80rpx 0 40rpx 0;
-}
-
 .login-list {
+  margin: 140rpx 0;
   display: flex;
-  padding: 40rpx 0;
-  justify-content: space-between;
+  align-items: center;
+  justify-content: space-around;
+}
 
 .login-item {
-    font-size: 24rpx;
-    text-align: center;
+  width: 80rpx;
 
-    > * {
-      margin: 4rpx 0;
-    }
-  }
+  border-radius: 10rpx;
+  height: 80rpx;
+  display: flex;
+  justify-content: center;
+  align-items: center;
 }
 </style>

pages/passport/wechatH5Login.vue

@@ -0,0 +1,153 @@
+<template>
+  <view class="container">
+    <u-navbar :custom-back="back" title="公众网页登录"></u-navbar>
+    <view class="wx-auth-container">
+      <div class="box">
+        <view class="logo-info">
+          <text class="title">欢迎进入{{ projectName }}</text>
+        </view>
+        <view class="small-tips">
+          <view>为您提供优质服务,{{ projectName }}需要获取以下信息</view>
+          <view>您的公开信息（昵称、头像）</view>
+        </view>
+        <view class="btns">
+          <button @click="getUserProfile()" class="btn-auth">使用微信授权</button>
+          <div @click="backToHome" class="btn-callback">暂不登录</div>
+        </view>
+      </div>
+    </view>
+  </view>
+</template>
+
+<script>
+import { whetherNavigate } from "@/utils/Foundation"; //登录跳转
+import config from "@/config/config";
+import api from "@/config/api.js";
+export default {
+  data() {
+    return {
+      // 授权信息展示，商城名称
+      projectName: config.name,
+    };
+  },
+
+  //微信小程序进入页面，先获取code，否则几率出现code和后续交互数据不对应情况
+  mounted() {
+    // 小程序默认分享
+    uni.showShareMenu({ withShareTicket: true });
+  },
+  methods: {
+    back() {
+      whetherNavigate();
+    },
+    getUserProfile() {
+      let code = "WECHAT";
+      let buyer = api.buyer;
+      window.open(buyer + `/connect/login/web/` + code, "_self");
+    },
+    backToHome() {
+      uni.switchTab({
+        url: `/pages/tabbar/home/index`,
+      });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+
+
+.wx-auth-container {
+  width: 100%;
+  
+  margin-top: 20%;
+}
+
+.logo-info {
+  display: flex;
+  flex-wrap: nowrap;
+  justify-content: flex-start;
+  flex-direction: row;
+  align-items: flex-start;
+  padding: 20rpx;
+  flex-direction: column;
+  font-weight: bold;
+}
+
+image {
+  width: 100px;
+  height: 100px;
+  text-align: center;
+  -webkit-transform: scale(2.5);
+  transform: scale(2.5);
+}
+
+text.title,
+text.shop {
+  display: inline-block;
+  font-size: 60rpx;
+  color: #333;
+}
+
+.box {
+  margin: 0 32rpx;
+}
+
+/* 文字提示*/
+.small-tips {
+  width: 94%;
+  padding: 20rpx;
+  font-size: 24rpx;
+  margin: 0 0 20rpx;
+  color: #999;
+}
+
+.btn-auth {
+  width: 92%;
+  background: $light-color;
+  color: #fff;
+  margin: 0 auto 40rpx;
+  border-radius: 100px;
+  animation: mymove 5s infinite;
+  -webkit-animation: mymove 5s infinite; /*Safari and Chrome*/
+  animation-direction: alternate; /*轮流反向播放动画。*/
+  animation-timing-function: ease-in-out; /*动画的速度曲线*/
+  /* Safari 和 Chrome */
+  -webkit-animation: mymove 5s infinite;
+  -webkit-animation-direction: alternate; /*轮流反向播放动画。*/
+  -webkit-animation-timing-function: ease-in-out; /*动画的速度曲线*/
+}
+.btn-callback {
+  text-align: center;
+  font-size: 30rpx;
+  background: #ededed;
+  height: 90rpx;
+  line-height: 90rpx;
+  border-radius: 100px;
+  width: 92%;
+  margin: 0 auto;
+}
+
+.btns {
+  margin-top: 100rpx;
+  display: flex;
+  flex-direction: column;
+  width: 100%;
+  justify-content: center;
+}
+
+@keyframes mymove {
+  0% {
+    transform: scale(1); /*开始为原始大小*/
+  }
+  25% {
+    transform: scale(1.1); /*放大1.1倍*/
+  }
+  50% {
+    transform: scale(1);
+  }
+  75% {
+    transform: scale(1.1);
+  }
+}
+</style>