wkw 3 周之前
父节点
当前提交
36654a4617

+ 7 - 1
app.json

@@ -40,6 +40,12 @@
   "permission": {
     "scope.userLocation": {
       "desc": "你的位置信息将用于推荐附近的门店"
+    },
+    "scope.userFuzzyLocation": {
+      "desc": "你的位置信息将用于推荐附近的门店"
     }
-  }
+  },
+  "requiredPrivateInfos": [ 
+    "getLocation"
+  ]
 }

+ 1 - 0
app.wxss

@@ -5,6 +5,7 @@
   flex-direction: column;
   box-sizing: border-box;
   background-color: #F7F7F7;
+  font-family: PingFangSC, PingFang SC;
 } 
 /*文本省略*/
 .m-ellipsis {

+ 0 - 3
pages/coupon/coupon.wxss

@@ -28,7 +28,6 @@
   width: 100%;
 }
 .card-cont-lf{
-  font-family: PingFangSC, PingFang SC;
   font-weight: 600;
   font-size: 24rpx;
   color: #FDA233;
@@ -37,7 +36,6 @@
 }
 .card-cont-ri{
   margin-left: 110rpx;
-  font-family: PingFangSC, PingFang SC;
   font-weight: 600;
   font-size: 28rpx;
   color: #000000;
@@ -54,7 +52,6 @@
   box-sizing: border-box;
 }
 .pop-time{
-  font-family: PingFangSC, PingFang SC;
   font-weight: 400;
   font-size: 20rpx;
   color: #B0B0B0;

+ 0 - 11
pages/couponDetail/couponDetail.wxss

@@ -7,14 +7,12 @@
   margin: 66rpx 56rpx 0;
 }
 .title{
-  font-family: PingFangSC, PingFang SC;
   font-weight: 600;
   font-size: 28rpx;
   color: #000000;
   line-height: 40rpx;
 }
 .time{
-  font-family: PingFangSC, PingFang SC;
   font-weight: 400;
   font-size: 24rpx;
   color: #B0B0B0;
@@ -31,11 +29,9 @@
 .code-img{
   width: 264rpx;
   height: 264rpx;
-  /* background: #FFFFFF; */
   border-radius: 20rpx;
 }
 .code-text{
-  font-family: PingFangSC, PingFang SC;
   font-weight: 400;
   font-size: 24rpx;
   color: #8D8D8D;
@@ -43,7 +39,6 @@
   margin: 34rpx 0 16rpx;
 }
 .barcode{
-  font-family: PingFangSC, PingFang SC;
   font-weight: 500;
   font-size: 24rpx;
   color: #FF5B00;
@@ -60,14 +55,12 @@
   align-items: center;
 }
 .box-lf{
-  font-family: PingFangSC, PingFang SC;
   font-weight: 600;
   font-size: 28rpx;
   color: #000000;
   line-height: 40rpx;
 }
 .box-ri{
-  font-family: PingFangSC, PingFang SC;
   font-weight: 400;
   font-size: 22rpx;
   color: #BCBCBC;
@@ -85,7 +78,6 @@
 }
 .explanation{
   display: flex;
-  font-family: PingFangSC, PingFang SC;
   font-weight: 600;
   font-size: 28rpx;
   color: #000000;
@@ -96,7 +88,6 @@
   top: -2px;
 }
 .period{
-  font-family: PingFangSC, PingFang SC;
   font-weight: 400;
   font-size: 24rpx;
   color: #767676;
@@ -109,14 +100,12 @@
 }
 .code-yhx-text{
   margin: 30rpx 0 20rpx;
-  font-family: PingFangSC, PingFang SC;
   font-weight: 500;
   font-size: 24rpx;
   color: #000000;
   line-height: 34rpx;
 }
 .barcode-yhx{
-  font-family: PingFangSC, PingFang SC;
   font-weight: 400;
   font-size: 22rpx;
   color: #BCBCBC;

+ 0 - 1
pages/index/index.wxss

@@ -40,7 +40,6 @@
   justify-content: space-evenly;
 }
 .rules-item{
-  font-family: PingFangSC, PingFang SC;
   font-weight: 400;
   font-size: 24rpx;
   color: #000000;

+ 5 - 5
pages/mine/mine.js

@@ -60,11 +60,11 @@ Page({
   async onSave(pathUrl){
     const res = await userModify({avatar:pathUrl});
     if(res.code == 200){
-      wx.showToast({
-        title: '更新成功',
-        icon: 'none',
-        duration: 2000
-      });
+      // wx.showToast({
+      //   title: '更新成功',
+      //   icon: 'none',
+      //   duration: 2000
+      // });
       app.globalData.userInfo = res.data;
     }else{
       wx.showToast({

+ 0 - 3
pages/mine/mine.wxss

@@ -27,7 +27,6 @@ page {
   align-items: center;
 }
 .user-text{
-  font-family: PingFangSC, PingFang SC;
   font-weight: 500;
   font-size: 32rpx;
   color: #FFFFFF;
@@ -81,7 +80,6 @@ page {
   color: #000 !important;
 }
 .van-cell-text{
-  font-family: PingFangSC, PingFang SC;
   font-weight: 400;
   font-size: 28rpx;
   color: #000000;
@@ -112,7 +110,6 @@ page {
   border-radius: 20rpx;
 }
 .box-text{
-  font-family: PingFangSC, PingFang SC;
   font-weight: 400;
   font-size: 24rpx;
   color: #8D8D8D;

+ 8 - 1
pages/register/register.js

@@ -208,11 +208,18 @@ Page({
   closeAgreementModal() {
     this.setData({ showAgreementModal: false });
   },
-
   onReceive() {
     this.setData({ showRegistrationSuccess: false });
     wx.navigateBack({ delta: 1 });
   },
+  //预览图片
+  previewImage(e){
+    const current = e.currentTarget.dataset.src;
+    wx.previewImage({
+      current,
+      urls: [current]
+    });
+  },
   startCountdown() {
     let countdown = this.data.countdown;
     this.setData({ codeText: `${countdown}s` });

+ 1 - 1
pages/register/register.wxml

@@ -95,7 +95,7 @@
             <block wx:if="{{filePath}}">
               <block wx:if="{{fileType === 'image'}}">
                 <view class="preview-wrap">
-                  <image src="{{filePath}}" class="preview-img" mode="aspectFit"/>
+                  <image src="{{filePath}}" class="preview-img" mode="aspectFit" data-src="{{filePath}}" bindtap="previewImage"/>
                   <view class="delete-btn" bindtap="removeFile">
                     <van-icon name="cross" color="#fff" size="16" class="delete-btn-icon"/>
                   </view>

+ 0 - 7
pages/register/register.wxss

@@ -56,7 +56,6 @@
   width: 168rpx;
 }
 .from-code{
-  font-family: PingFangSC, PingFang SC;
   font-weight: 500;
   font-size: 24rpx;
   color: #FF9200;
@@ -117,7 +116,6 @@
   flex-direction: column;
   align-items: center;
   justify-content: center;
-  font-family: PingFangSC, PingFang SC;
   font-weight: 400;
   font-size: 28rpx;
   color: #4A4A4A;
@@ -130,7 +128,6 @@
 }
 .agree{
   margin: 0 32rpx 32rpx;
-  font-family: PingFangSC, PingFang SC;
   font-weight: 400;
   font-size: 24rpx;
   color: #000000;
@@ -201,7 +198,6 @@
 }
 .pop-card-cont-lf{
   flex-shrink: 0;
-  font-family: PingFangSC, PingFang SC;
   font-weight: 600;
   font-size: 24rpx;
   color: #FDA233;
@@ -210,7 +206,6 @@
 .pop-card-cont-ri{
   box-sizing: border-box;
   margin-left: 72rpx;
-  font-family: PingFangSC, PingFang SC;
   font-weight: 600;
   font-size: 28rpx;
   color: #000000;
@@ -219,7 +214,6 @@
   overflow: hidden;
 }
 .pop-time{
-  font-family: PingFangSC, PingFang SC;
   font-weight: 400;
   font-size: 20rpx;
   color: #B0B0B0;
@@ -234,7 +228,6 @@
   height: 102rpx;
 }
 .error-text{
-  font-family: PingFangSC, PingFang SC;
   font-weight: 400;
   color: #ee0a24;
   font-size: 24rpx;

+ 0 - 2
pages/registrationRecords/registrationRecords.wxss

@@ -23,7 +23,6 @@
   padding: 30rpx 0 0 32rpx;
 }
 .card-title{
-  font-family: PingFangSC, PingFang SC;
   font-weight: 600;
   font-size: 32rpx;
   color: #000000;
@@ -31,7 +30,6 @@
   margin-bottom: 10rpx;
 }
 .card-time{
-  font-family: PingFangSC, PingFang SC;
   font-weight: 400;
   font-size: 24rpx;
   color: #B0B0B0;

+ 0 - 1
pages/rules/rules.wxss

@@ -5,7 +5,6 @@
   flex: 1;
   overflow: auto;
   margin: 22rpx 32rpx;
-  font-family: PingFangSC, PingFang SC;
   font-weight: 400;
   font-size: 28rpx;
   color: #000000;

+ 0 - 2
pages/setting/setting.wxss

@@ -5,7 +5,6 @@
   flex: 1;
   overflow: auto;
   margin: 0 32rpx 22rpx;
-  font-family: PingFangSC, PingFang SC;
   font-weight: 400;
   font-size: 28rpx;
   color: #000000;
@@ -39,7 +38,6 @@
   line-height: 40rpx;
 }
 .card-text{
-  font-family: PingFangSC, PingFang SC;
   font-weight: 400;
   font-size: 28rpx;
   color: #747474;

+ 0 - 1
pages/store/store.wxss

@@ -21,7 +21,6 @@
 }
 .card-ri{
   flex: 1;
-  font-family: PingFangSC, PingFang SC;
   overflow: hidden;
 }
 .card-ri-title{

+ 0 - 2
pages/storeDetail/storeDetail.wxss

@@ -21,7 +21,6 @@
 }
 .card-ri{
   flex: 1;
-  font-family: PingFangSC, PingFang SC;
 }
 .card-ri-title{
   font-weight: 500;
@@ -45,7 +44,6 @@
 .address{
   padding:32rpx 0 36rpx;
   border-bottom: 1px solid #EEEEEE;
-  font-family: PingFangSC, PingFang SC;
   font-weight: 400;
   font-size: 24rpx;
   color: #000000;

+ 5 - 0
utils/upload.js

@@ -23,7 +23,12 @@ export function uploadImage(filePath, url = '/api/upload/image', name = 'file')
         // wx.hideLoading();
         try {
           const data = JSON.parse(res.data);
+          console.log(data)
           if (data.code === 200 && data.ret) {
+            wx.showToast({
+              title: '上传成功',
+              icon: 'none'
+            });
             resolve(data.data);
           } else {
             wx.showToast({

+ 1 - 1
utils/util.js

@@ -2,7 +2,7 @@ import { getUserInfo,behaviorReport } from '../api/user'
 // 获取手机号
 export const MAKE_PHONE_CALL = (phoneNumber) => {
   if (!phoneNumber) {
-    phoneNumber = '15527606226';
+    wx.showToast({ title: '暂无手机号', icon: 'none' });
   }
   wx.makePhoneCall({
     phoneNumber: phoneNumber,