cxc/yshopb2c-uniapp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

合并冲突

Browse Source
This commit is contained in:
Gao xiaosong
2020-11-18 00:45:00 +08:00
parent 288246cea9 af33d0d8b2
commit 30b462fe26
18 changed files with 394 additions and 378 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -11,6 +11,6 @@ yarn-error.log*
*.ntvs*
*.njsproj
*.sln
*.keystore
unpackage/dist
unpackage/resources

2
assets/css/style.css
View File

File diff suppressed because one or more lines are too long

2
assets/css/style.css.map
View File

File diff suppressed because one or more lines are too long

6
assets/css/style.less
View File

@ -5077,11 +5077,13 @@ page {
}
.product-con .assemble .item .pictxt {
width: 2.95*100rpx;
flex:1;
}
.product-con .assemble .item .pictxt .text {
width: 1.94*100rpx;
flex:1;
font-size: 0.24*100rpx;
padding-left:15rpx
}
.product-con .assemble .item .pictxt .pictrue {

7
components/WriteOff.vue
View File

@ -1,9 +1,8 @@
<template>
<view v-show="iShidden === false">
<view class="WriteOff">
<view class="pictrue"><image :src="orderInfo.image" /></view>
<view class="num acea-row row-center-wrapper">
{{ orderInfo.order_id }}
{{ orderInfo.orderId }}
</view>
<view class="tip">确定要核销此订单吗？</view>
<view class="sure" @click="confirm">确定核销</view>
@ -15,7 +14,7 @@
<style scoped lang="less">
.WriteOff {
width: 5.6*100rpx;
height: 8*100rpx;
height: 5*100rpx;
background-color: #fff;
border-radius: 0.2*100rpx;
position: fixed;
@ -23,8 +22,8 @@
left: 50%;
margin-top: -4*100rpx;
margin-left: -2.8*100rpx;
z-index: 99;
padding-top: 0.55*100rpx;
z-index: 99999;
}
.WriteOff .pictrue {
width: 3.4*100rpx;

BIN
my-release-key.keystore
View File

Binary file not shown.

BIN
myappSignKey.keystore
View File

Binary file not shown.

2
pages/Loading/index.vue
View File

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

4
pages/activity/GroupDetails/index.vue
View File

@ -65,8 +65,8 @@
<text class="font-color-red" v-text="item.count"></text>
<text>人成团</text>
</view>
<count-down :isDay="false" :tipText="'剩余 '" :dayText="false" :hourText="':'" :minuteText="':'"
:secondText="false" :datatime="item.stopTime/1000"></count-down>
<count-down :isDay="true" :tipText="'剩余 '" :dayText="' 天 '" :hourText="' : '" :minuteText="' : '"
:secondText="' '" :datatime="item.stopTime/1000"></count-down>
</view>
<view class="spellBnt" @click="groupRule(item.id)">
去拼单

74
pages/activity/GroupRule/index.vue
View File

@ -1,6 +1,6 @@
<template>
<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">
<image :src="storeCombination.image" />
</view>
@ -15,20 +15,13 @@
<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>
<view class="wrapper">
<view class="wrapper" v-if="pinkT">
<view class="title acea-row row-center-wrapper">
<view class="line"></view>
<view class="name acea-row row-center-wrapper">
<text>剩余</text>
<count-down
:isDay="false"
:tipText="false"
:dayText="false"
:hourText="' : '"
:minuteText="' : '"
:secondText="false"
:datatime="pinkT.stopTime/1000"
></count-down>
<count-down :isDay="true" :tipText="'倒计时 '" :dayText="' 天 '" :hourText="' 时 '" :minuteText="' 分 '"
:secondText="' 秒'" :datatime="pinkT.stopTime/1000"></count-down>
<text>结束</text>
</view>
<view class="line"></view>
@ -38,11 +31,10 @@
<text class="tips" v-else-if="pinkBool === -1">还差{{ count }}人，拼团失败</text>
<text class="tips font-color-red" v-else-if="pinkBool === 0">拼团中，还差{{ count }}人拼团成功</text>
</view>
<view
class="list acea-row row-middle"
:class="[pinkBool === 1 || pinkBool === -1 ? 'result' : '',iShidden ? 'on' : '']"
>
<view class="pictrue">
<view class="list acea-row row-middle"
:class="[pinkBool === 1 || pinkBool === -1 ? 'result' : '',iShidden ? 'on' : '']">
<view class="pictrue" v-if="pinkT">
<image :src="pinkT.avatar" />
</view>
<view class="acea-row row-middle" v-if="pinkAll.length > 0">
@ -54,29 +46,17 @@
<image class="img-none" src="@/static/images/vacancy.png" />
</view>
</view>
<view
v-if="(pinkBool === 1 || pinkBool === -1) && count > 9"
class="lookAll acea-row row-center-wrapper"
@click="lookAll"
>
<view v-if="(pinkBool === 1 || pinkBool === -1) && count > 9" class="lookAll acea-row row-center-wrapper"
@click="lookAll">
{{ iShidden ? "收起" : "查看全部" }}
<text class="iconfont" :class="iShidden ? 'icon-xiangshang' : 'icon-xiangxia'"></text>
</view>
<view
class="teamBnt bg-color-red"
v-if="userBool === 1 && isOk == 0 && pinkBool === 0"
@click="goPoster"
>邀请好友参团</view>
<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="teamBnt bg-color-red" v-if="userBool === 1 && isOk == 0 && pinkBool === 0" @click="goPoster">邀请好友参团
</view>
<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">
<text class="iconfont icon-guanbi3"></text>
<text>取消开团</text>
@ -90,9 +70,18 @@
</template>
<script>
import CountDown from "@/components/CountDown";
import { getCombinationPink, getCombinationRemove } from "@/api/activity";
import { postCartAdd } from "@/api/store";
import { isWeixin, parseQuery, handleQrCode } from "@/utils/index";
import {
getCombinationPink,
getCombinationRemove
} from "@/api/activity";
import {
postCartAdd
} from "@/api/store";
import {
isWeixin,
parseQuery,
handleQrCode
} from "@/utils/index";
const NAME = "GroupRule";
export default {
@ -108,8 +97,8 @@ export default {
pinkBool: 0, //判断拼团是否成功|0=失败,1=成功
userBool: 0, //判断当前用户是否在团内|0=未在,1=在
pinkAll: [], //团员
pinkT: [], //团长信息
storeCombination: [], //拼团产品
pinkT: {}, //团长信息
storeCombination: {}, //拼团产品
pinkId: 0,
uniqueId: "",
count: 0, //拼团剩余人数
@ -156,8 +145,7 @@ export default {
})
.catch(err => {
uni.showToast({
title:
err.msg || err.response.data.msg || err.response.data.message,
title: err.msg || err.response.data.msg || err.response.data.message,
icon: "none",
duration: 2000
});

5
pages/authorization/index.vue
View File

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

37
pages/orderAdmin/OrderCancellation/index.vue
View File

@ -8,19 +8,26 @@
<input type="number" placeholder="0" v-model="verify_code" />
</view>
<view class="bnt" @click="storeCancellation">立即核销</view>
<view class="bnt" @click="openQRCode">扫码核销</view>
</view>
<!-- #ifndef H5 -->
<!-- <view class="scan" v-if="iswechat">
<image src="@/static/images/scan.gif" @click="openQRCode" />
</view> -->
<!-- #endif -->
<WriteOff :iShidden="iShidden" :orderInfo="orderInfo" @cancel="cancel" @confirm="confirm"></WriteOff>
</view>
</template>
<script>
import WriteOff from "@/components/WriteOff";
import { isWeixin } from "@/utils";
import {
isWeixin
} from "@/utils";
// import { wechatEvevt } from "@/libs/wechat";
import { orderVerific } from "@/api/order";
import {
orderVerific
} from "@/api/order";
const NAME = "OrderCancellation";
export default {
@ -32,7 +39,6 @@ export default {
data: function() {
return {
iShidden: true,
iswechat: isWeixin(),
orderInfo: {},
verify_code: ""
};
@ -55,8 +61,7 @@ export default {
})
.catch(err => {
uni.showToast({
title:
err.msg || err.response.data.msg || err.response.data.message,
title: err.msg || err.response.data.msg || err.response.data.message,
icon: "none",
duration: 2000
});
@ -97,8 +102,7 @@ export default {
.catch(error => {
uni.hideLoading();
uni.showToast({
title:
error.msg ||
title: error.msg ||
error.response.data.msg ||
error.response.data.message,
icon: "none",
@ -109,6 +113,22 @@ export default {
openQRCode: function() {
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
});
}
}
})
}
}
};
@ -119,6 +139,7 @@ export default {
width: 100%;
height: 3 * 100rpx;
background-size: 100% 100%;
image {
width: 100%;
height: 3 * 100rpx;
@ -131,7 +152,7 @@ export default {
margin: -0.93 * 100rpx auto 0 auto;
padding-top: 0.8 * 100rpx;
padding-bottom: 30rpx;
z-index: 99;
z-index: 20;
position: relative;
border-radius: 0.06 * 100rpx 0.06 * 100rpx 0 0;
}

1
pages/user/User/index.vue
View File

@ -216,7 +216,6 @@
title: "绑定中"
});
bindingPhone({
code: cookie.get('wxLoginCode'),
encryptedData: e.mp.detail.encryptedData,
iv: e.mp.detail.iv
})

2
pages/user/UserBill/index.vue
View File

@ -13,7 +13,7 @@
<view class="itemn acea-row row-between-wrapper">
<view>
<view class="name line1">{{ val.title }}</view>
<view>{{ val.add_time }}</view>
<view>{{ val.addTime }}</view>
</view>
<view
class="num"

9
utils/index.js
View File

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

7
utils/request.js
View File

@ -62,10 +62,17 @@ function baseRequest(options) {
// 合并传参过来的 headers
// 如果接口需要登录，携带 token 去请求
options.headers = {
...options.headers
}
if (options.login === true) {
options.headers = {
...options.headers,
Authorization: "Bearer " + token
}
}
// 如果需要登录才可访问的接口没有拿到 token 视为登录失效
if (options.login === true && !token) {

2
utils/store/cookie.js
View File

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