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

Merge branch 'master' of https://git.dayouqiantu.cn/uniapp/yshop-uniapp

Browse Source
This commit is contained in:
Gao xiaosong
2020-10-30 01:43:42 +08:00
parent d267396a7b f744b242a0
commit 107c4c40f0
14 changed files with 196 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
assets/css/style.less
View File

@ -6313,7 +6313,7 @@ page {
margin: 0.25*100rpx auto 0 auto;
padding: 0.53*100rpx 0 0.58*100rpx 0;
left: 50%;
margin-left: -3.55*100rpx;
//margin-left: -3.55*100rpx;
}
.cash-audit .pictrue {

3
components/CitySelect.vue
View File

@ -195,7 +195,6 @@ export default {
background-color: #fff;
z-index: 1502;
position: relative;
height: 800rpx;
padding-bottom: 0;
padding-bottom: constant(safe-area-inset-bottom);
padding-bottom: env(safe-area-inset-bottom);
@ -203,7 +202,7 @@ export default {
height: 100%;
}
.swiper {
height: 100%;
height: 800rpx;
}
}
.cityselect-header {

2
components/OrderGoods.vue
View File

@ -16,7 +16,7 @@
v-if="cart.productInfo.attrInfo"
>{{ cart.productInfo.attrInfo.sku }}</view>
<view class="money font-color-red">￥{{ cart.truePrice }}</view>
<view class="evaluate" v-if="evaluate == 3" @click="routerGo(cart)">评价</view>
<view class="evaluate" v-if="evaluate == 3 && cart.isReply==0" @click="routerGo(cart)">评价</view>
</view>
</view>
</view>

4
config/index.js
View File

@ -1,7 +1,7 @@
// export const VUE_APP_API_URL = 'http://natapp.xinxintuan.co/api';
export const VUE_APP_API_URL = 'https://wxapi.yixiang.co/api';
//export const VUE_APP_API_URL = 'https://wxapi.yixiang.co/api';
// export const VUE_APP_API_URL = 'http://192.168.31.223:8008/api';
// export const VUE_APP_API_URL = 'https://h5api.xinxintuan.co/api';
export const VUE_APP_API_URL = 'https://h5api.xinxintuan.co/api';
// export const VUE_APP_API_URL = 'https://h5api.xinxintuan.co/api';
export const VUE_APP_RESOURCES_URL = 'https://wx.yixiang.co/static';

3
manifest.json
View File

@ -92,7 +92,8 @@
"hdpi" : "unpackage/res/splash/480+762.png",
"xhdpi" : "unpackage/res/splash/720+1242.png",
"xxhdpi" : "unpackage/res/splash/1080+1882.png"
}
},
"iosStyle" : "common"
},
"icons" : {
"android" : {

23
pages/activity/DargainDetails/index.vue
View File

@ -55,8 +55,8 @@
<!-- 砍价进度条下的金额 -->
<view class="balance acea-row row-between-wrapper">
<view v-text="'已砍' + bargainHelpCount.alreadyPrice + '元'"></view>
<view v-if="bargainHelpCount.remainingPrice === 0">砍价成功</view>
<view v-else v-text="'还剩' + bargainHelpCount.remainingPrice + '元'"></view>
<view v-if="bargainHelpCount.price === 0">砍价成功</view>
<view v-else v-text="'还剩' + bargainHelpCount.price + '元'"></view>
</view>
<!-- 砍价成功：-->
@ -267,15 +267,18 @@
// 查看商品
openAlone: function () {
this.$yrouter.push({
path: "/detail/" + this.bargain.productId
path: "/pages/shop/GoodsCon/index",
query: {
id: this.goodsDetail.productId
}
});
},
// 砍价完成，去支付
goPay: function () {
var data = {};
var that = this;
data.productId = that.bargain.productId;
data.cartNum = that.bargain.num;
data.productId = that.goodsDetail.productId;
data.cartNum = that.goodsDetail.num;
data.uniqueId = "";
data.bargainId = that.bargainId;
data.new = 1;
@ -379,7 +382,7 @@
getBargainHelp: function () {
var that = this;
if (
this.bargainHelpCount.remainingPrice === 0 &&
this.bargainHelpCount.price === 0 &&
that.bargainUid !== that.userInfo.uid
) {
return uni.showToast({
@ -478,7 +481,7 @@
bargainUserUid: this.bargainUid
})
.then(res => {
// 剩余砍价金额 = 商品价格 - 已经砍掉的金额
// 剩余砍价金额，显示已砍至￥** 使用 = 商品价格 - 已经砍掉的金额
let remainingPrice = (this.goodsDetail.price - res.data.alreadyPrice).toFixed(2)
this.bargainHelpCount = {
...res.data,
@ -514,7 +517,7 @@
if (
this.bargainUid === this.userInfo.uid &&
this.bargainHelpCount.status == 1 &&
this.bargainHelpCount.remainingPrice > 0
this.bargainHelpCount.price > 0
) {
this.inviteFriends = true
} else {
@ -526,7 +529,7 @@
this.bargainUid != this.userInfo.uid &&
this.bargainHelpCount.status == 1 &&
// this.bargainHelpCount.userBargainStatus &&
this.bargainHelpCount.remainingPrice > 0
this.bargainHelpCount.price > 0
) {
this.helpFriendsBargain = true
} else {
@ -537,7 +540,7 @@
if (
this.bargainUid === this.userInfo.uid &&
this.bargainHelpCount.status == 1 &&
this.bargainHelpCount.remainingPrice <= 0
this.bargainHelpCount.price <= 0
) {
this.pay = true
} else {

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

@ -10,8 +10,8 @@
<view class="acea-row row-middle">
<view class="times">
<view>距秒杀结束仅剩</view>
<count-down :isDay="false" :tipText="false" :dayText="false" :hourText="' : '" :minuteText="' : '"
:secondText="false" :datatime="datatime"></count-down>
<count-down :isDay="false" :tipText="' '" :dayText="' '" :hourText="' : '" :minuteText="' : '"
:secondText="' '" :datatime="datatime"></count-down>
</view>
<view class="iconfont icon-jiantou"></view>
</view>

2
pages/home/index.vue
View File

@ -214,7 +214,7 @@
},
},
onShow: function() {
onLoad: function() {
this.getLocation()
let that = this;
uni.showLoading({

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

@ -178,7 +178,7 @@ export default {
res => {
that.vipRequire = res.data.list;
that.vipComplete = res.data.task;
that.taskCount = res.data.reach_count;
that.taskCount = res.data.reachCount;
},
err => {
uni.showToast({

50
pages/user/promotion/PromoterList/index.vue
View File

@ -13,22 +13,14 @@
</view>
</view>
<view class="nav acea-row row-around">
<view
class="item"
:class="screen.grade == 0 ? 'on' : ''"
@click="checkGrade(0)"
>一级({{ first||'0' }})</view>
<view
class="item"
:class="screen.grade == 1 ? 'on' : ''"
@click="checkGrade(1)"
>二级({{ second||'0' }})</view>
<view class="item" :class="screen.grade == 0 ? 'on' : ''" @click="checkGrade(0)">一级({{ first||'0' }})</view>
<view class="item" :class="screen.grade == 1 ? 'on' : ''" @click="checkGrade(1)">二级({{ second||'0' }})</view>
</view>
<view class="search acea-row row-between-wrapper">
<form @submit.prevent="submitForm">
<view class="input">
<input placeholder="点击搜索会员名称" v-model="screen.keyword" />
<text class="iconfont icon-guanbi"></text>
<text class="iconfont icon-guanbi" @click="screen.keyword=''"></text>
</view>
</form>
<view class="iconfont icon-sousuo2"></view>
@ -56,11 +48,8 @@
</view>
</view>
<view :class="fixedState === true ? 'sortList' : ''">
<view
class="item acea-row row-between-wrapper"
v-for="(val, spreadListIndex) in spreadList"
:key="spreadListIndex"
>
<view class="item acea-row row-between-wrapper" v-for="(val, spreadListIndex) in spreadList"
:key="spreadListIndex">
<view class="picTxt acea-row row-between-wrapper">
<view class="pictrue">
<image :src="val.avatar" />
@ -84,15 +73,17 @@
</view>
</template>
<script>
import { getSpreadUser } from "@/api/user";
import Loading from "@/components/Loading";
export default {
import {
getSpreadUser
} from "@/api/user";
import Loading from "@/components/Loading";
export default {
name: "PromoterList",
components: {
Loading
},
props: {},
data: function() {
data: function () {
return {
fixedState: false,
screen: {
@ -113,14 +104,14 @@ export default {
second: ""
};
},
mounted: function() {
mounted: function () {
this.getSpreadUsers();
},
onReachBottom() {
!this.loading && this.getSpreadUsers();
},
watch: {
"screen.sort": function() {
"screen.sort": function () {
this.screen.page = 0;
this.loaded = false;
this.loading = false;
@ -129,7 +120,7 @@ export default {
}
},
methods: {
handleScroll: function() {
handleScroll: function () {
// var scrollTop =
// document.documentElement.scrollTop || document.body.scrollTop;
// var offsetTop = document.querySelector(".header").clientHeight;
@ -139,14 +130,14 @@ export default {
// this.fixedState = false;
// }
},
submitForm: function() {
submitForm: function () {
this.screen.page = 0;
this.loaded = false;
this.loading = false;
this.spreadList = [];
this.getSpreadUsers();
},
getSpreadUsers: function() {
getSpreadUsers: function () {
let that = this,
screen = that.screen;
if (that.loaded || that.loading) return;
@ -163,8 +154,7 @@ export default {
},
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
});
@ -172,7 +162,7 @@ export default {
300
);
},
checkGrade: function(val) {
checkGrade: function (val) {
if (val == this.screen.grade) return;
else {
this.screen.page = 1;
@ -183,7 +173,7 @@ export default {
this.getSpreadUsers();
}
},
sort: function(types) {
sort: function (types) {
let that = this;
switch (types) {
case "childCount":
@ -245,5 +235,5 @@ export default {
}
}
}
};
};
</script>

1
unpackage/debug/.ios.ins Normal file
View File

@ -0,0 +1 @@
installed

BIN
unpackage/debug/iOS_debug.ipa Normal file
View File

Binary file not shown.

7
utils/index.js
View File

@ -240,6 +240,11 @@ export const login = () => {
reject('当前运行环境为H5')
return
}
if (Vue.prototype.$deviceType == 'app') {
console.log('当前运行环境为app')
reject('当前运行环境为app')
return
}
console.log('————————————————————')
console.log('开始登录')
console.log('————————————————————')
@ -983,7 +988,7 @@ export function chooseImage(callback) {
console.log(image);
uni.showLoading({ title: "图片上传中", mask: true });
uni.uploadFile({
url: `${VUE_APP_API_URL} /api/upload`,
url: `${VUE_APP_API_URL}/api/upload`,
file: image,
filePath: image.path,
header: {

7
utils/request.js
View File

@ -41,6 +41,13 @@ fly.interceptors.response.use(
console.log('————————')
handleLoginFailure();
return Promise.reject({ msg: "未登录", toLogin: true });
}
if (error.response.data.status == 5109) {
uni.showToast({
title: error.response.data.msg,
icon: "none",
duration: 2000
});
}
return Promise.reject(error);
}