修复bug

src/api/request.js

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-01-25 11:32:04
- * @LastEditTime: 2021-01-26 13:32:34
+ * @LastEditTime: 2021-03-08 21:22:17
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: \rebatedine-mini\src\api\request.js
@@ -15,9 +15,9 @@ import { USER_TOKEN } from '../store/storageKeys'
 export default {
   config: {
     baseUrl:
-      process.env.NODE_ENV === 'development'
-        ? 'https://apitest.topboom0912.com/bwc/'
-        : 'https://apitest.topboom0912.com/bwc/',
+      process.env.NODE_ENV === 'development1'
+        ? 'http://localhost:18333/'
+        : 'https://api.qcbwc.cn/',
     data: '',
     header: {
       'Content-Type': 'application/x-www-form-urlencoded'
@@ -57,8 +57,9 @@ export default {
         if (data.code === 200) {
           resolve(data)
         } else if (data.code === 1000) {
+          console.log(1111)
           uni.navigateTo({
-            url: '/pagesSub/login/login'
+            url: '/pagesSub/other/login'
           })
         } else {
           resolve(data)

src/pages.json

@@ -1,151 +1,182 @@
 {
-	"easycom": {
-		"^u-(.*)": "uview-ui/components/u-$1/u-$1.vue"
-	},
-	"pages": [
-		{
-			"path": "pages/index",
-			"style": {
-				"navigationStyle": "custom",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/classification",
-			"style": {
-				"navigationBarTitleText": "分类",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/order",
-			"style": {
-				"navigationBarTitleText": "订单",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/my",
-			"style": {
-				"navigationBarTitleText": "个人中心"
-			}
-		}
-	],
-	"subPackages": [{
-		"root": "pagesSub/activity",
-		"pages": [{
-			"path": "activityDetail",
-			"style": {
-				"navigationBarTitleText": "免费吃活动详情",
-				"enablePullDownRefresh": true
-			}
-		}, {
-			"path": "signUpOutcome",
-			"style": {
-				"navigationBarTitleText": "报名结果"
-			}
-		}]
-	}, {
-		"root": "pagesSub/my",
-		"pages": [{
-			"path": "about",
-			"style": {
-				"navigationBarTitleText": "关于我们"
-			}
-		}, {
-			"path": "commonProblem",
-			"style": {
-				"navigationBarTitleText": "常见问题"
-			}
-		}, {
-			"path": "userDetail",
-			"style": {
-				"navigationBarTitleText": "个人信息"
-			}
-		}]
-	}, {
-		"root": "pagesSub/order",
-		"pages": [{
-			"path": "submitOrder",
-			"style": {
-				"navigationBarTitleText": "提交订单"
-			}
-		}, {
-			"path": "submitOutcome",
-			"style": {
-				"navigationBarTitleText": "提交结果"
-			}
-		}, {
-			"path": "rule",
-			"style": {
-				"navigationBarTitleText": "评价规则"
-			}
-		}]
-	}, {
-		"root": "pagesSub/other",
-		"pages": [{
-			"path": "login",
-			"style": {
-				"navigationBarTitleText": ""
-			}
-		}, {
-			"path": "webView"
-		}, {
-			"path": "noviceStrategy",
-			"style": {
-				"navigationBarTitleText": "新手攻略"
-			}
-		}]
-	}],
-	"preloadRule": {
-		"pages/index": {
-			"network": "all",
-			"packages": ["pagesSub/activity"]
-		},
-		"pages/classification": {
-			"network": "all",
-			"packages": ["pagesSub/activity"]
-		},
-		"pages/order": {
-			"network": "all",
-			"packages": ["pagesSub/order"]
-		},
-		"pages/my": {
-			"network": "wifi",
-			"packages": ["pagesSub/my"]
-		}
-	},
-	"globalStyle": {
-		"navigationBarTextStyle": "black",
-		"navigationBarTitleText": "趣吃",
-		"navigationBarBackgroundColor": "#FFFFFF",
-		"backgroundColor": "#F4F5F9"
-	},
-	"tabBar": {
+  "easycom": {
+    "^u-(.*)": "uview-ui/components/u-$1/u-$1.vue"
+  },
+  "pages": [
+    {
+      "path": "pages/index",
+      "style": {
+        "navigationStyle": "custom",
+        "enablePullDownRefresh": true
+      }
+    },
+    {
+      "path": "pages/classification",
+      "style": {
+        "navigationBarTitleText": "分类",
+        "enablePullDownRefresh": true
+      }
+    },
+    {
+      "path": "pages/order",
+      "style": {
+        "navigationBarTitleText": "订单",
+        "enablePullDownRefresh": true
+      }
+    },
+    {
+      "path": "pages/my",
+      "style": {
+        "navigationBarTitleText": "个人中心"
+      }
+    }
+  ],
+  "subPackages": [
+    {
+      "root": "pagesSub/activity",
+      "pages": [
+        {
+          "path": "activityDetail",
+          "style": {
+            "navigationBarTitleText": "免费吃活动详情",
+            "enablePullDownRefresh": true
+          }
+        },
+        {
+          "path": "signUpOutcome",
+          "style": {
+            "navigationBarTitleText": "报名结果"
+          }
+        }
+      ]
+    },
+    {
+      "root": "pagesSub/my",
+      "pages": [
+        {
+          "path": "kefu",
+          "style": {
+            "navigationBarTitleText": "联系客服"
+          }
+        },
+        {
+          "path": "about",
+          "style": {
+            "navigationBarTitleText": "关于我们"
+          }
+        },
+        {
+          "path": "commonProblem",
+          "style": {
+            "navigationBarTitleText": "常见问题"
+          }
+        },
+        {
+          "path": "userDetail",
+          "style": {
+            "navigationBarTitleText": "个人信息"
+          }
+        }
+      ]
+    },
+    {
+      "root": "pagesSub/order",
+      "pages": [
+        {
+          "path": "submitOrder",
+          "style": {
+            "navigationBarTitleText": "提交订单"
+          }
+        },
+        {
+          "path": "submitOutcome",
+          "style": {
+            "navigationBarTitleText": "提交结果"
+          }
+        },
+        {
+          "path": "rule",
+          "style": {
+            "navigationBarTitleText": "评价规则"
+          }
+        }
+      ]
+    },
+    {
+      "root": "pagesSub/other",
+      "pages": [
+        {
+          "path": "login",
+          "style": {
+            "navigationBarTitleText": ""
+          }
+        },
+        {
+          "path": "webView"
+        },
+        {
+          "path": "noviceStrategy",
+          "style": {
+            "navigationBarTitleText": "新手攻略"
+          }
+        }
+      ]
+    }
+  ],
+  "preloadRule": {
+    "pages/index": {
+      "network": "all",
+      "packages": ["pagesSub/activity"]
+    },
+    "pages/classification": {
+      "network": "all",
+      "packages": ["pagesSub/activity"]
+    },
+    "pages/order": {
+      "network": "all",
+      "packages": ["pagesSub/order"]
+    },
+    "pages/my": {
+      "network": "wifi",
+      "packages": ["pagesSub/my"]
+    }
+  },
+  "globalStyle": {
+    "navigationBarTextStyle": "black",
+    "navigationBarTitleText": "趣吃",
+    "navigationBarBackgroundColor": "#FFFFFF",
+    "backgroundColor": "#F4F5F9"
+  },
+  "tabBar": {
     "color": "#999999",
     "selectedColor": "#FF6632",
     "borderStyle": "black",
     "backgroundColor": "#ffffff",
-    "list": [{
-			"pagePath": "pages/index",
-			"iconPath": "static/tabber/icon_db_home.png",
-			"selectedIconPath": "static/tabber/icon_db_home2.png",
-			"text": "首页"
-    }, {
-			"pagePath": "pages/classification",
-			"iconPath": "static/tabber/icon_db_fenl.png",
-			"selectedIconPath": "static/tabber/icon_db_fenl2.png",
-			"text": "分类"
-    }, {
-			"pagePath": "pages/order",
-			"iconPath": "static/tabber/icon_db_dingdan.png",
-			"selectedIconPath": "static/tabber/icon_db_dingdan2.png",
-			"text": "订单"
-		}, {
-			"pagePath": "pages/my",
-			"iconPath": "static/tabber/icon_db_my.png",
-			"selectedIconPath": "static/tabber/icon_db_my2.png",
-			"text": "我的"
-		}]
-	}
+    "list": [
+      {
+        "pagePath": "pages/index",
+        "iconPath": "static/tabber/icon_db_home.png",
+        "selectedIconPath": "static/tabber/icon_db_home2.png",
+        "text": "首页"
+      },
+      {
+        "pagePath": "pages/classification",
+        "iconPath": "static/tabber/icon_db_fenl.png",
+        "selectedIconPath": "static/tabber/icon_db_fenl2.png",
+        "text": "分类"
+      },
+      {
+        "pagePath": "pages/order",
+        "iconPath": "static/tabber/icon_db_dingdan.png",
+        "selectedIconPath": "static/tabber/icon_db_dingdan2.png",
+        "text": "订单"
+      },
+      {
+        "pagePath": "pages/my",
+        "iconPath": "static/tabber/icon_db_my.png",
+        "selectedIconPath": "static/tabber/icon_db_my2.png",
+        "text": "我的"
+      }
+    ]
+  }
 }

src/pages/index.vue

@@ -157,6 +157,19 @@ export default {
     this.activityList = []
     this.getActivityData()
     this.enable = true
+    const updateManager = uni.getUpdateManager()
+    updateManager.onUpdateReady(function (res) {
+      uni.showModal({
+        title: '更新提示',
+        content: '新版本已经准备好，是否重启应用？',
+        success (res) {
+          if (res.confirm) {
+            // 新的版本已经下载好，调用 applyUpdate 应用新版本并重启
+            updateManager.applyUpdate()
+          }
+        }
+      })
+    })
   },
   onHide () {
     this.enable = true

src/pages/my.vue

@@ -32,6 +32,12 @@
         <view class="u-font-28 ml-28 u-flex-1 title">关于我们</view>
         <view class="jiantou-wh icon-jiantou "></view>
       </view>
+      <view class="item u-flex u-border-bottom"
+            @click="toDetail(4)">
+        <view class="icon-wh icon-kf"></view>
+        <view class="u-font-28 ml-28 u-flex-1 title">联系客服</view>
+        <view class="jiantou-wh icon-jiantou "></view>
+      </view>
       <view class="item u-flex"
             @click="toDetail(3)">
         <view class="icon-wh icon-order"></view>
@@ -55,6 +61,12 @@ export default {
   methods: {
     toDetail (type) {
       let url
+      if (type === 4) {
+        url = '/pagesSub/my/kefu'
+        uni.navigateTo({
+          url: url
+        })
+      }
       if (type === 1 || type === 2) {
         url = type === 1 ? '/pagesSub/my/commonProblem' : '/pagesSub/my/about'
         uni.navigateTo({

src/pagesSub/my/kefu.vue

@@ -0,0 +1,92 @@
+<!--
+ * @Author: your name
+ * @Date: 2021-01-27 12:27:59
+ * @LastEditTime: 2021-03-08 19:40:25
+ * @LastEditors: Please set LastEditors
+ * @Description: In User Settings Edit
+ * @FilePath: \rebatedine-mini\src\pagesSub\my\about.vue
+-->
+<template>
+  <view class="main">
+    <network-error />
+    <view class="logo">
+      <image src="~@/static/common/logo_gywm.png"></image>
+    </view>
+    <view class="info u-font-32 line-32">
+      趣吃客服微信号：zqbl2021
+    </view>
+    <view class="copy"
+          @click="copyKf">点击复制</view>
+    <view class="kefu">
+      <image src="~@/static/icon/wechat-logo.png"
+             class="avatar"></image>
+    </view>
+    <view class="info u-font-32">趣吃客服微信二维码</view>
+  </view>
+</template>
+
+<script>
+export default {
+  data () {
+    return {}
+  },
+  mounted () { },
+  methods: {
+    copyKf () {
+      uni.setClipboardData({
+        data: 'zqbl2021',
+        success: () => {
+          uni.showToast({
+            icon: 'none',
+            title: '已复制客服微信号，请添加客服反馈'
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.main {
+  width: 100%;
+  height: 100vh;
+  background-color: #fff;
+  box-sizing: border-box;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  padding: 64px 48px 0;
+}
+.kefu {
+  text-align: center;
+  .avatar {
+    width: 322rpx;
+    height: 322rpx;
+    margin-top: 136rpx;
+  }
+}
+.logo {
+  text-align: center;
+  image {
+    margin-top: 32px;
+    width: 128px;
+    height: 128px;
+    border-radius: 8px;
+    background-color: $u-light-color;
+  }
+}
+.info {
+  color: #212121;
+  text-align: center;
+  margin-top: 32rpx;
+}
+.copy {
+  margin-top: 22rpx;
+  width: 30.67%;
+  height: 66rpx;
+  border: 2rpx solid #aaaaaa;
+  line-height: 66rpx;
+  text-align: center;
+}
+</style>

src/pagesSub/order/submitOrder.vue

@@ -59,7 +59,7 @@
             <view class="u-rela img-item">
               <image :src="item.url | imgFilter(4)"
                      mode="aspectFill"
-                     @click="lookImg(imgList2, index)"></image>
+                     @click="lookImg(imgList1, index)"></image>
               <view class="icon-del-red-wh icon-del-red"
                     @click="delImg(index, 1)"></view>
             </view>
@@ -102,7 +102,7 @@
             <view class="u-rela img-item">
               <image :src="item.url | imgFilter(4)"
                      mode="aspectFill"
-                     @click="lookImg(imgList2, index)"></image>
+                     @click="lookImg(imgList3, index)"></image>
               <view class="icon-del-red-wh icon-del-red"
                     @click="delImg(index, 3)"></view>
             </view>
@@ -111,6 +111,27 @@
                 @click="uploadImg(3)"></view>
         </view>
       </view>
+      <view class="item u-border-bottom">
+        <view class="label u-flex">
+          <view class="icon-bt"></view>
+          <view>门店搜索结果页截图<span class="u-content-color u-font-30 line-42">（截图需包含当前门店）</span>
+          </view>
+        </view>
+        <view class="u-flex u-flex-wrap u-p-t-40">
+          <block v-for="(item, index) in imgList4"
+                 :key="index">
+            <view class="u-rela img-item">
+              <image :src="item.url | imgFilter(4)"
+                     mode="aspectFill"
+                     @click="lookImg(imgList4, index)"></image>
+              <view class="icon-del-red-wh icon-del-red"
+                    @click="delImg(index, 4)"></view>
+            </view>
+          </block>
+          <view class="upload icon-upload-bg"
+                @click="uploadImg(4)"></view>
+        </view>
+      </view>
     </view>
     <button class="sub u-m-t-12"
             :disabled="disabledBtn"
@@ -135,7 +156,8 @@ export default {
       },
       imgList1: [], // 订单截图（含店名与实付金额）
       imgList2: [], // 订单截图（含下单时间与订单号）
-      imgList3: [] // 评价截图（需上传评价截图）
+      imgList3: [], // 评价截图（需上传评价截图）
+      imgList4: [] // 搜索结果截图
     }
   },
   computed: {
@@ -144,7 +166,9 @@ export default {
       return this.$store.state.userInfo
     },
     disabledBtn () {
-      if (!this.imgList3.length) {
+      if (!this.imgList4.length) {
+        return true
+      } else if (!this.imgList3.length) {
         return true
       } else if (!this.imgList2.length) {
         return true
@@ -189,8 +213,10 @@ export default {
         this.imgList1 = this.imgList1.concat(imgs)
       } else if (type === 2) {
         this.imgList2 = this.imgList2.concat(imgs)
-      } else {
+      } else if (type === 3) {
         this.imgList3 = this.imgList3.concat(imgs)
+      } else if (type === 4) {
+        this.imgList4 = this.imgList4.concat(imgs)
       }
     },
     delImg (index, type) {
@@ -198,8 +224,10 @@ export default {
         this.imgList1.splice(index, 1)
       } else if (type === 2) {
         this.imgList2.splice(index, 1)
-      } else {
+      } else if (type === 3) {
         this.imgList3.splice(index, 1)
+      } else if (type === 4) {
+        this.imgList4.splice(index, 1)
       }
     },
     // 点击提交
@@ -215,7 +243,8 @@ export default {
       const imgList1 = this.dealImg(this.imgList1, 1)
       const imgList2 = this.dealImg(this.imgList2, 2)
       const imgList3 = this.dealImg(this.imgList3, 3)
-      this.form.img_items = this.form.img_items.concat(imgList1, imgList2, imgList3)
+      const imgList4 = this.dealImg(this.imgList4, 4)
+      this.form.img_items = this.form.img_items.concat(imgList1, imgList2, imgList3, imgList4)
       this.submitForm()
     },
     // 处理上传图片

src/pagesSub/order/submitOutcome.vue

@@ -8,12 +8,13 @@
     <view class="u-flex u-row-center">
       <view class="message">
         <view class="title u-font-24 line-28">返利时间</view>
-        <view class="content u-font-24 line-34">审核通过后，返利金额将在第二天的12点——24点打入您的微信红包</view>
+        <view class="content u-font-24 line-34">审核通过后，返利金额将在当天打入您的支付宝账户</view>
       </view>
     </view>
     <view class="btn u-flex u-row-center">
       <button @click="toIndex">回到首页</button>
-      <button class="active" open-type="share">分享活动</button>
+      <button class="active"
+              open-type="share">分享活动</button>
     </view>
   </view>
 </template>
@@ -78,51 +79,51 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-  .main {
-    background-color: #FFF;
-    padding-top: 15px;
-  }
-  .success {
-    color: $u-main-color;
-    font-weight: 1000;
-    margin: 48px 0;
-  }
-  .icon-success-wh {
-    width: 92px;
-    height: 92px;
-    margin-right: 16px;
+.main {
+  background-color: #fff;
+  padding-top: 15px;
+}
+.success {
+  color: $u-main-color;
+  font-weight: 1000;
+  margin: 48px 0;
+}
+.icon-success-wh {
+  width: 92px;
+  height: 92px;
+  margin-right: 16px;
+}
+.message {
+  width: 686px;
+  height: 156px;
+  color: $u-main-color;
+  background-color: #f7f8f9;
+  padding: 24px;
+  border-radius: 8px;
+  .title {
+    font-family: Helvetica;
+    margin-bottom: 8px;
   }
-  .message {
-    width: 686px;
-    height: 156px;
+}
+.btn {
+  button {
+    width: 280px;
+    height: 84px;
+    border: 1px solid #d3d4d5;
+    border-radius: 42px;
+    font-size: 28px;
+    line-height: 40px;
     color: $u-main-color;
-    background-color: #F7F8F9;
-    padding: 24px;
-    border-radius: 8px;
-    .title {
-      font-family: Helvetica;
-      margin-bottom: 8px;
-    }
+    background-color: #fff;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    margin: 40px 0;
   }
-  .btn {
-    button {
-      width: 280px;
-      height: 84px;
-      border: 1px solid #D3D4D5;
-      border-radius: 42px;
-      font-size: 28px;
-      line-height: 40px;
-      color: $u-main-color;
-      background-color: #FFF;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      margin: 40px 0;
-    }
-    .active {
-      border: 1px solid #FF6632;
-      color: $u-type-primary;
-      margin-left: 30px;
-    }
+  .active {
+    border: 1px solid #ff6632;
+    color: $u-type-primary;
+    margin-left: 30px;
   }
+}
 </style>

src/pagesSub/other/login.vue

@@ -1,11 +1,27 @@
+<!--
+ * @Author: your name
+ * @Date: 2021-01-25 11:32:04
+ * @LastEditTime: 2021-03-08 21:23:31
+ * @LastEditors: your name
+ * @Description: In User Settings Edit
+ * @FilePath: \rebatedine-mini\src\pagesSub\other\login.vue
+-->
 <template>
   <view class="login-main">
     <network-error />
-    <view class="header-image"><open-data type="userAvatarUrl"></open-data></view>
-    <view class="u-m-t-30 u-font-40 line-56 bold">您好，<open-data type="userNickName"></open-data></view>
+    <view class="header-image">
+      <open-data type="userAvatarUrl"></open-data>
+    </view>
+    <view class="u-m-t-30 u-font-40 line-56 bold">您好，<open-data type="userNickName"></open-data>
+    </view>
     <view class="u-m-t-32 u-font-28 line-40 u-content-color">登录小程序，请先授权微信信息</view>
-    <button class="login-btn u-font-32 line-44 bold" open-type="getUserInfo" @getuserinfo="changeUserInfo">
-      <u-icon class="u-m-r-16" name="weixin-fill" color="#FFF" size="32"></u-icon>
+    <button class="login-btn u-font-32 line-44 bold"
+            open-type="getUserInfo"
+            @getuserinfo="changeUserInfo">
+      <u-icon class="u-m-r-16"
+              name="weixin-fill"
+              color="#FFF"
+              size="32"></u-icon>
       微信登录授权
     </button>
   </view>
@@ -15,6 +31,7 @@
 export default {
   methods: {
     async changeUserInfo (data) {
+      console.log(data)
       if (data.detail.errMsg === 'getUserInfo:ok') {
         uni.showLoading({
           title: '正在登录...'

src/pagesSub/other/noviceStrategy.vue

@@ -38,8 +38,8 @@
       </view>
       <view class="item">
         <view class="line-40  bold">4.获取返利</view>
-        <view class="u-m-t-8 u-new-color line-34">审核通过后，返利金额将直接打入用户微信支付账户。</view>
-        <view class="desc line-34">审核相关事宜：当成功提交资料后，系统会对提交结果的信息进行审核，若参与订单存在且符合要求，则会在第二天的12点-24点之间进行返款。若审核不通过，无法获得返利金额。</view>
+        <view class="u-m-t-8 u-new-color line-34">审核通过后，返利金额将直接打入用户支付宝账户。</view>
+        <view class="desc line-34">审核相关事宜：当成功提交资料后，系统会对提交结果的信息进行审核，若参与订单存在且符合要求，则会在当天进行返款。若审核不通过，无法获得返利金额。</view>
       </view>
     </view>
     <view class="content">
@@ -50,7 +50,7 @@
       <view class="desc u-m-t-8 line-34">参与活动共有4个步骤：</view>
       <view class="item">
         <view class="line-40 bold">1.报名规则</view>
-        <view class="u-m-t-8 u-new-color line-34">用户定位10km范围以外活动不能够报名。同平台（例如美团、饿了么）单门店单用户每天只能报名一次。</view>
+        <view class="u-m-t-8 u-new-color line-34">同平台（例如美团、饿了么）单门店单用户每天只能报名一次。</view>
         <view class="desc line-34">霸王餐与返利餐均为限时限量活动，当活动时间过期或参与名额为零时，则无法报名。</view>
       </view>
       <view class="item">

src/store/index.js

@@ -7,7 +7,7 @@ Vue.use(Vuex)
 
 const store = new Vuex.Store({
   state: {
-    imgPrefix: 'https://image.topboom0912.com/',
+    imgPrefix: 'https://image.qcbwc.cn/',
     ossImgResize: {},
     openid: uni.getStorageSync(storageKeys.OPENIDID) || '', // 微信code换取openid
     userInfo: uni.getStorageSync(storageKeys.USER_INFO) || {}, // 用户信息
@@ -55,7 +55,8 @@ const store = new Vuex.Store({
         })
         let userData = {}
         let params = {}
-        if (state.openid === '' || sessionInfo.errMsg !== 'checkSession:ok') {
+        // if (state.openid === '' || sessionInfo.errMsg !== 'checkSession:ok')
+        {
           const openid = await dispatch('getUserCode')
           if (!openid) {
             return

src/uni.scss

@@ -115,6 +115,10 @@ $u-border-color: #EAEBEC;
   background: url('~@/static/icon/aboutour.png') no-repeat center center;
   background-size: contain;
 }
+.icon-kf {
+  background: url('~@/static/icon/icon_kf.png') no-repeat center center;
+  background-size: contain;
+}
 .icon-order {
   background: url('~@/static/icon/order.png') no-repeat center center;
   background-size: contain;