Loki
/
fish-uniapp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

1.修改小程序段拼团未登录情况下无法进行登录回跳的问题 

2.新增订单扫码核销的功能
3.修改cookie方法未取到值返回null导致报错的问题
4.修改loading页面跳转登录的问题
master
Gaoxs 4 years ago
parent
fdd9d1d72d
commit
95a8589448
7 changed files with 365 additions and 357 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      pages/Loading/index.vue
  2. 106
      pages/activity/GroupRule/index.vue
  3. 5
      pages/authorization/index.vue
  4. 78
      pages/orderAdmin/OrderCancellation/index.vue
  5. BIN
      static/images/scan.gif
  6. 9
      utils/index.js
  7. 2
      utils/store/cookie.js

2
pages/Loading/index.vue
Unescape View File

@ -71,7 +71,7 @@
toLaunch() { toLaunch() {
console.log("loading home"); console.log("loading home");
this.changeAuthorization(false); this.changeAuthorization(false);
let redirect = cookie.get('redirect') let redirect = cookie.get('redirect').replace(/\ /g, '')
if (redirect && redirect.indexOf('/pages') != -1) { if (redirect && redirect.indexOf('/pages') != -1) {
this.$yrouter.replace({ this.$yrouter.replace({
path: '/pages' + redirect.split('/pages')[1], path: '/pages' + redirect.split('/pages')[1],

106
pages/activity/GroupRule/index.vue
Unescape View File

@ -1,6 +1,6 @@
<template> <template>
<view class="group-con"> <view class="group-con">
<view class="header acea-row row-between-wrapper"> <view class="header acea-row row-between-wrapper" v-if="storeCombination">
<view class="pictrue"> <view class="pictrue">
<image :src="storeCombination.image" /> <image :src="storeCombination.image" />
</view> </view>
@ -15,20 +15,13 @@
<view v-if="pinkBool === -1" class="iconfont icon-pintuanshibai"></view> <view v-if="pinkBool === -1" class="iconfont icon-pintuanshibai"></view>
<view v-else-if="pinkBool === 1" class="iconfont icon-pintuanchenggong font-color-red"></view> <view v-else-if="pinkBool === 1" class="iconfont icon-pintuanchenggong font-color-red"></view>
</view> </view>
<view class="wrapper"> <view class="wrapper" v-if="pinkT">
<view class="title acea-row row-center-wrapper"> <view class="title acea-row row-center-wrapper">
<view class="line"></view> <view class="line"></view>
<view class="name acea-row row-center-wrapper"> <view class="name acea-row row-center-wrapper">
<text>剩余</text> <text>剩余</text>
<count-down <count-down :isDay="true" :tipText="'倒计时 '" :dayText="' 天 '" :hourText="' 时 '" :minuteText="' 分 '"
:isDay="false" :secondText="' 秒'" :datatime="pinkT.stopTime/1000"></count-down>
:tipText="false"
:dayText="false"
:hourText="' : '"
:minuteText="' : '"
:secondText="false"
:datatime="pinkT.stopTime/1000"
></count-down>
<text>结束</text> <text>结束</text>
</view> </view>
<view class="line"></view> <view class="line"></view>
@ -38,11 +31,10 @@
<text class="tips" v-else-if="pinkBool === -1">还差{{ count }}人，拼团失败</text> <text class="tips" v-else-if="pinkBool === -1">还差{{ count }}人，拼团失败</text>
<text class="tips font-color-red" v-else-if="pinkBool === 0">拼团中，还差{{ count }}人拼团成功</text> <text class="tips font-color-red" v-else-if="pinkBool === 0">拼团中，还差{{ count }}人拼团成功</text>
</view> </view>
<view
class="list acea-row row-middle" <view class="list acea-row row-middle"
:class="[pinkBool === 1 || pinkBool === -1 ? 'result' : '',iShidden ? 'on' : '']" :class="[pinkBool === 1 || pinkBool === -1 ? 'result' : '',iShidden ? 'on' : '']">
> <view class="pictrue" v-if="pinkT">
<view class="pictrue">
<image :src="pinkT.avatar" /> <image :src="pinkT.avatar" />
</view> </view>
<view class="acea-row row-middle" v-if="pinkAll.length > 0"> <view class="acea-row row-middle" v-if="pinkAll.length > 0">
@ -54,29 +46,17 @@
<image class="img-none" src="@/static/images/vacancy.png" /> <image class="img-none" src="@/static/images/vacancy.png" />
</view> </view>
</view> </view>
<view <view v-if="(pinkBool === 1 || pinkBool === -1) && count > 9" class="lookAll acea-row row-center-wrapper"
v-if="(pinkBool === 1 || pinkBool === -1) && count > 9" @click="lookAll">
class="lookAll acea-row row-center-wrapper"
@click="lookAll"
>
{{ iShidden ? "收起" : "查看全部" }} {{ iShidden ? "收起" : "查看全部" }}
<text class="iconfont" :class="iShidden ? 'icon-xiangshang' : 'icon-xiangxia'"></text> <text class="iconfont" :class="iShidden ? 'icon-xiangshang' : 'icon-xiangxia'"></text>
</view> </view>
<view <view class="teamBnt bg-color-red" v-if="userBool === 1 && isOk == 0 && pinkBool === 0" @click="goPoster">邀请好友参团
class="teamBnt bg-color-red" </view>
v-if="userBool === 1 && isOk == 0 && pinkBool === 0" <view class="teamBnt bg-color-red" v-else-if="userBool === 0 && pinkBool === 0 && count > 0" @click="pay">我要参团
@click="goPoster" </view>
>邀请好友参团</view> <view class="teamBnt bg-color-red" v-if="pinkBool === 1 || pinkBool === -1"
<view @click="goDetail(storeCombination.id)">再次开团</view>
class="teamBnt bg-color-red"
v-else-if="userBool === 0 && pinkBool === 0 && count > 0"
@click="pay"
>我要参团</view>
<view
class="teamBnt bg-color-red"
v-if="pinkBool === 1 || pinkBool === -1"
@click="goDetail(storeCombination.id)"
>再次开团</view>
<view class="cancel" @click="getCombinationRemove" v-if="pinkBool === 0 && userBool === 1"> <view class="cancel" @click="getCombinationRemove" v-if="pinkBool === 0 && userBool === 1">
<text class="iconfont icon-guanbi3"></text> <text class="iconfont icon-guanbi3"></text>
<text>取消开团</text> <text>取消开团</text>
@ -89,27 +69,36 @@
</view> </view>
</template> </template>
<script> <script>
import CountDown from "@/components/CountDown"; import CountDown from "@/components/CountDown";
import { getCombinationPink, getCombinationRemove } from "@/api/activity"; import {
import { postCartAdd } from "@/api/store"; getCombinationPink,
import { isWeixin, parseQuery, handleQrCode } from "@/utils/index"; getCombinationRemove
} from "@/api/activity";
import {
postCartAdd
} from "@/api/store";
import {
isWeixin,
parseQuery,
handleQrCode
} from "@/utils/index";
const NAME = "GroupRule"; const NAME = "GroupRule";
export default { export default {
name: NAME, name: NAME,
components: { components: {
CountDown CountDown
}, },
props: {}, props: {},
data: function() { data: function () {
return { return {
currentPinkOrder: "", //当前拼团订单 currentPinkOrder: "", //当前拼团订单
isOk: 0, //判断拼团是否完成 isOk: 0, //判断拼团是否完成
pinkBool: 0, //判断拼团是否成功|0=失败,1=成功 pinkBool: 0, //判断拼团是否成功|0=失败,1=成功
userBool: 0, //判断当前用户是否在团内|0=未在,1=在 userBool: 0, //判断当前用户是否在团内|0=未在,1=在
pinkAll: [], //团员 pinkAll: [], //团员
pinkT: [], //团长信息 pinkT: {}, //团长信息
storeCombination: [], //拼团产品 storeCombination: {}, //拼团产品
pinkId: 0, pinkId: 0,
uniqueId: "", uniqueId: "",
count: 0, //拼团剩余人数 count: 0, //拼团剩余人数
@ -125,7 +114,7 @@ export default {
} }
} }
}, },
mounted: function() { mounted: function () {
var that = this; var that = this;
let url = handleQrCode(); let url = handleQrCode();
if (url) { if (url) {
@ -136,7 +125,7 @@ export default {
that.getCombinationPink(); that.getCombinationPink();
}, },
methods: { methods: {
pay: function() { pay: function () {
var that = this; var that = this;
var data = {}; var data = {};
data.productId = that.storeCombination.productId; data.productId = that.storeCombination.productId;
@ -156,14 +145,13 @@ export default {
}) })
.catch(err => { .catch(err => {
uni.showToast({ uni.showToast({
title: title: err.msg || err.response.data.msg || err.response.data.message,
err.msg || err.response.data.msg || err.response.data.message,
icon: "none", icon: "none",
duration: 2000 duration: 2000
}); });
}); });
}, },
goPoster: function() { goPoster: function () {
var that = this; var that = this;
this.$yrouter.push({ this.$yrouter.push({
path: "/pages/activity/Poster/index", path: "/pages/activity/Poster/index",
@ -173,7 +161,7 @@ export default {
} }
}); });
}, },
goOrder: function() { goOrder: function () {
var that = this; var that = this;
this.$yrouter.push({ this.$yrouter.push({
path: "/pages/order/OrderDetails/index", path: "/pages/order/OrderDetails/index",
@ -183,13 +171,13 @@ export default {
}); });
}, },
//拼团列表 //拼团列表
goList: function() { goList: function () {
this.$yrouter.push({ this.$yrouter.push({
path: "/pages/activity/GoodsGroup/index" path: "/pages/activity/GoodsGroup/index"
}); });
}, },
//拼团详情 //拼团详情
goDetail: function(id) { goDetail: function (id) {
this.$yrouter.push({ this.$yrouter.push({
path: "/pages/activity/GroupDetails/index", path: "/pages/activity/GroupDetails/index",
query: { query: {
@ -198,7 +186,7 @@ export default {
}); });
}, },
//拼团信息 //拼团信息
getCombinationPink: function() { getCombinationPink: function () {
var that = this; var that = this;
getCombinationPink(that.pinkId).then(res => { getCombinationPink(that.pinkId).then(res => {
that.$set(that, "storeCombination", res.data.storeCombination); that.$set(that, "storeCombination", res.data.storeCombination);
@ -213,7 +201,7 @@ export default {
}); });
}, },
//拼团取消 //拼团取消
getCombinationRemove: function() { getCombinationRemove: function () {
var that = this; var that = this;
getCombinationRemove({ getCombinationRemove({
id: that.pinkId, id: that.pinkId,
@ -234,16 +222,16 @@ export default {
}); });
}); });
}, },
lookAll: function() { lookAll: function () {
this.iShidden = !this.iShidden; this.iShidden = !this.iShidden;
} }
} }
}; };
</script> </script>
<style lang="less"> <style lang="less">
.tips-warp { .tips-warp {
text-align: center; text-align: center;
margin-top: 20rpx; margin-top: 20rpx;
} }
</style> </style>

5
pages/authorization/index.vue
Unescape View File

@ -90,8 +90,9 @@
}); });
login() login()
.then((res) => { .then((res) => {
this.$yrouter.replace({ console.log('重定向')
path: cookie.get("redirect") this.$yrouter.reLaunch({
path: cookie.get("redirect").replace(/\ /g, '')
}); });
}) })
.catch((error) => { .catch((error) => {

78
pages/orderAdmin/OrderCancellation/index.vue
Unescape View File

@ -9,21 +9,27 @@
</view> </view>
<view class="bnt" @click="storeCancellation">立即核销</view> <view class="bnt" @click="storeCancellation">立即核销</view>
</view> </view>
<!-- <view class="scan" v-if="iswechat"> <!-- #ifndef H5 -->
<view class="scan" v-if="iswechat">
<image src="@/static/images/scan.gif" @click="openQRCode" /> <image src="@/static/images/scan.gif" @click="openQRCode" />
</view> --> </view>
<!-- #endif -->
<WriteOff :iShidden="iShidden" :orderInfo="orderInfo" @cancel="cancel" @confirm="confirm"></WriteOff> <WriteOff :iShidden="iShidden" :orderInfo="orderInfo" @cancel="cancel" @confirm="confirm"></WriteOff>
</view> </view>
</template> </template>
<script> <script>
import WriteOff from "@/components/WriteOff"; import WriteOff from "@/components/WriteOff";
import { isWeixin } from "@/utils"; import {
// import { wechatEvevt } from "@/libs/wechat"; isWeixin
import { orderVerific } from "@/api/order"; } from "@/utils";
const NAME = "OrderCancellation"; // import { wechatEvevt } from "@/libs/wechat";
import {
orderVerific
} from "@/api/order";
const NAME = "OrderCancellation";
export default { export default {
name: NAME, name: NAME,
components: { components: {
WriteOff WriteOff
@ -32,7 +38,6 @@ export default {
data: function() { data: function() {
return { return {
iShidden: true, iShidden: true,
iswechat: isWeixin(),
orderInfo: {}, orderInfo: {},
verify_code: "" verify_code: ""
}; };
@ -55,8 +60,7 @@ export default {
}) })
.catch(err => { .catch(err => {
uni.showToast({ uni.showToast({
title: title: err.msg || err.response.data.msg || err.response.data.message,
err.msg || err.response.data.msg || err.response.data.message,
icon: "none", icon: "none",
duration: 2000 duration: 2000
}); });
@ -97,8 +101,7 @@ export default {
.catch(error => { .catch(error => {
uni.hideLoading(); uni.hideLoading();
uni.showToast({ uni.showToast({
title: title: error.msg ||
error.msg ||
error.response.data.msg || error.response.data.msg ||
error.response.data.message, error.response.data.message,
icon: "none", icon: "none",
@ -109,49 +112,66 @@ export default {
openQRCode: function() { openQRCode: function() {
let that = this; let that = this;
// 这里需要调用扫码功能 // 这里需要调用扫码功能
uni.scanCode({
success: (res) => {
var result = res.result;
if (result) {
that.verify_code = res.result;
that.storeCancellation();
} else {
uni.showToast({
title: '没有扫描到什么！',
icon: "none",
duration: 2000
});
}
}
})
} }
} }
}; };
</script> </script>
<style scoped lang="less"> <style scoped lang="less">
.OrderCancellation .header { .OrderCancellation .header {
width: 100%; width: 100%;
height: 3 * 100rpx; height: 3 * 100rpx;
background-size: 100% 100%; background-size: 100% 100%;
image { image {
width: 100%; width: 100%;
height: 3 * 100rpx; height: 3 * 100rpx;
} }
} }
.OrderCancellation .whiteBg { .OrderCancellation .whiteBg {
width: 6.9 * 100rpx; width: 6.9 * 100rpx;
background-color: #fff; background-color: #fff;
margin: -0.93 * 100rpx auto 0 auto; margin: -0.93 * 100rpx auto 0 auto;
padding-top: 0.8 * 100rpx; padding-top: 0.8 * 100rpx;
padding-bottom: 30rpx; padding-bottom: 30rpx;
z-index:20; z-index: 20;
position: relative; position: relative;
border-radius: 0.06 * 100rpx 0.06 * 100rpx 0 0; border-radius: 0.06 * 100rpx 0.06 * 100rpx 0 0;
} }
.OrderCancellation .whiteBg .input { .OrderCancellation .whiteBg .input {
width: 5.8 * 100rpx; width: 5.8 * 100rpx;
margin: 0 auto; margin: 0 auto;
border-bottom: 0.01 * 100rpx solid #eee; border-bottom: 0.01 * 100rpx solid #eee;
} }
.OrderCancellation .whiteBg .input input { .OrderCancellation .whiteBg .input input {
padding-bottom: 0.25 * 100rpx; padding-bottom: 0.25 * 100rpx;
font-size: 0.6 * 100rpx; font-size: 0.6 * 100rpx;
height: auto; height: auto;
color: #282828; color: #282828;
width: 100%; width: 100%;
text-align: center; text-align: center;
} }
.OrderCancellation .whiteBg .bnt { .OrderCancellation .whiteBg .bnt {
font-size: 0.32 * 100rpx; font-size: 0.32 * 100rpx;
color: #fff; color: #fff;
width: 5.8 * 100rpx; width: 5.8 * 100rpx;
@ -163,17 +183,17 @@ export default {
text-align: center; text-align: center;
line-height: 0.86 * 100rpx; line-height: 0.86 * 100rpx;
margin: 0.55 * 100rpx auto 0 auto; margin: 0.55 * 100rpx auto 0 auto;
} }
.OrderCancellation .scan { .OrderCancellation .scan {
width: 3 * 100rpx; width: 3 * 100rpx;
height: 3 * 100rpx; height: 3 * 100rpx;
margin: 1.1 * 100rpx auto 0 auto; margin: 1.1 * 100rpx auto 0 auto;
} }
.OrderCancellation .scan image { .OrderCancellation .scan image {
width: 100%; width: 100%;
height: 100%; height: 100%;
display: block; display: block;
} }
</style> </style>

BIN
static/images/scan.gif
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 191 KiB

9
utils/index.js
Unescape View File

@ -211,7 +211,7 @@ export const login = () => {
if (code) { if (code) {
auth(code) auth(code)
.then(() => { .then(() => {
let redirect = cookie.get('redirect') let redirect = cookie.get('redirect').replace(/\ /g, '')
console.log(redirect) console.log(redirect)
if (redirect) { if (redirect) {
redirect = redirect.split('/pages')[1] redirect = redirect.split('/pages')[1]
@ -327,7 +327,7 @@ export const handleGetUserInfo = () => {
store.dispatch('setUserInfo', res.data) store.dispatch('setUserInfo', res.data)
console.log('获取用户信息后跳转回显的页面') console.log('获取用户信息后跳转回显的页面')
let redirect = cookie.get('redirect') let redirect = cookie.get('redirect').replace(/\ /g, '')
if (redirect) { if (redirect) {
reLaunch({ reLaunch({
path: redirect, path: redirect,
@ -585,11 +585,9 @@ export function routerPermissions(url, type) {
}) })
return return
} }
{
push({ push({
path, path,
}) })
}
}).catch(error => { }).catch(error => {
console.log('————————') console.log('————————')
console.log('自动登录失败，跳转到授权页面') console.log('自动登录失败，跳转到授权页面')
@ -661,7 +659,7 @@ export function reLaunch(location, complete, fail, success) {
uni.reLaunch(params) uni.reLaunch(params)
}).catch(error => { }).catch(error => {
// 没有权限 // 没有权限
console.log(error)
}) })
} }
@ -850,6 +848,7 @@ export const handleLoginFailure = () => {
// 改为授权取消 // 改为授权取消
store.commit("updateAuthorization", false); store.commit("updateAuthorization", false);
let currentPageUrl = getCurrentPageUrl() let currentPageUrl = getCurrentPageUrl()
if (store.state.$deviceType == 'weixin') { if (store.state.$deviceType == 'weixin') {
// 如果不是授权页面， // 如果不是授权页面，

2
utils/store/cookie.js
Unescape View File

@ -5,7 +5,7 @@ const doc = null;
function get(key) { function get(key) {
if (!key || !_has(key)) { if (!key || !_has(key)) {
return null; return '';
} }
return uni.getStorageSync(key) return uni.getStorageSync(key)
} }

Write Preview
Loading…
Cancel
Save