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

合并冲突

Browse Source
This commit is contained in:
gaoxs
2020-07-14 09:38:05 +08:00
parent 63c3530314 54eec53e79
commit ae5860c94e
19 changed files with 707 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
pages/home/index.vue
View File

@ -30,7 +30,7 @@
<view>{{ item.name }}</view>
</view>
</view>
<view class="news acea-row ">
<!-- <view class="news acea-row ">
<view class="pictrue" v-if="$VUE_APP_RESOURCES_URL">
<image src="@/static/images/news.png" />
</view>
@ -49,8 +49,18 @@
</block>
</swiper>
</view>
</view> -->
<!-- <view class="wrapper hot" v-if="likeInfo.length > 0"> -->
<view class="nav acea-row">
<view @click="goWxappUrl(item)" class="item" v-for="(item, menusIndex) in menus" :key="menusIndex">
<view class="pictrue">
<image :src="item.pic" />
</view>
<view>{{ item.name }}</view>
</view>
</view>
<view class="wrapper hot" v-if="likeInfo.length > 0">
<uni-notice-bar scrollable="true" single="true" speed="30" showIcon="true" :text="singNew.info"></uni-notice-bar>
<view class="wrapper hot" v-if="bastList.length > 0">
<image class="bg" src="../../static/images/index-bg.png" mode="widthFix"></image>
<view class="title no-border acea-row row-between-wrapper">
<div class="text line1">
@ -148,6 +158,7 @@
import GoodList from '@/components/GoodList';
import PromotionGood from '@/components/PromotionGood';
import CouponWindow from '@/components/CouponWindow';
import uniNoticeBar from '@/components/uni-notice-bar/uni-notice-bar.vue'
import {
getHomeData,
getShare
@ -165,6 +176,7 @@
components: {
// swiper,
// swiperSlide,
uniNoticeBar,
GoodList,
PromotionGood,
CouponWindow
@ -246,6 +258,11 @@
}
};
},
computed:{
singNew() {
return this.roll.length > 0 ? this.roll[0] : "你还没添加通知哦！";
}
},
onShow: function() {
this.getLocation()
let that = this;

8
pages/order/MyOrder/index.vue
View File

@ -4,11 +4,7 @@
<view class="picTxt acea-row row-between-wrapper">
<view class="text">
<view class="name">订单信息</view>
<view>
累计订单：{{ orderData.orderCount || 0 }} 总消费：￥{{
orderData.sumPrice || 0
}}
</view>
<view>累计订单：{{ orderData.orderCount || 0 }} 总消费：￥{{orderData.sumPrice || 0 }}</view>
</view>
</view>
</view>
@ -45,7 +41,7 @@
<span class="sign cart-color acea-row row-center-wrapper" v-if="order.seckillId > 0">秒杀</span>
<span class="sign cart-color acea-row row-center-wrapper" v-if="order.bargainId > 0">砍价</span>
<span class="sign cart-color acea-row row-center-wrapper" v-if="order.storeId > 0">门店</span>
{{ dataFormat(order.addTime) }}
{{ order.createTime }}
</view>
<view class="font-color-red">{{ getStatus(order) }}</view>
</view>

2
pages/order/OrderDetails/index.vue
View File

@ -5,7 +5,7 @@
<view class="data" :class="refundOrder ? 'on' : ''">
<view class="state">{{ orderInfo._status._msg }}</view>
<view>
<data-format :date="orderInfo.addTime"></data-format>
{{ orderInfo.createTime }}
</view>
</view>
</view>

8
pages/order/OrderSubmission/index.vue
View File

@ -12,7 +12,7 @@
class="item font-color-red"
:class="shipping_type === 1 ? 'on' : 'on2'"
@click="addressType(1)"
v-if="storeSelfMention"
v-if="systemStore"
></view>
</view>
<view
@ -634,7 +634,11 @@ export default {
.catch(err => {
uni.hideLoading();
uni.showToast({
title: err.response.data.msg || "创建订单失败",
title:
err.msg ||
err.response.data.msg ||
err.response.data.message ||
"创建订单失败",
icon: "none",
duration: 2000
});

4
pages/shop/GoodsCollection/index.vue
View File

@ -14,7 +14,7 @@
<view class="infor line1">{{ item.storeName }}</view>
<view class="acea-row row-between-wrapper">
<view class="money font-color-red">￥{{ item.price }}</view>
<view class="delete" @click.prevent="delCollection(collectProductListIndex)">删除</view>
<view class="delete" @tap.stop="delCollection(collectProductListIndex)">删除</view>
</view>
</view>
</view>
@ -86,7 +86,7 @@ export default {
category = that.collectProductList[index].category;
getCollectDel(id, category).then(function() {
uni.showToast({
title: "添加购物车成功",
title: "删除成功",
icon: "success",
duration: 2000,
complete: () => {

16
pages/user/Recharge/index.vue
View File

@ -24,13 +24,13 @@
>
<view class="pic-number-pic">
<text>
{{ item.price }}
{{ item.value.price }}
<text class="pic-number">元</text>
</text>
</view>
<view class="pic-number">赠送：{{ item.give_price }} 元</view>
<view class="pic-number" v-if="item.value.give_price > 0">赠送：{{ item.value.give_price }} 元</view>
</view>
<view
<!-- <view
class="pic-box pic-box-color acea-row row-center-wrapper"
@click="picCharge(picList.length, money)"
>
@ -40,7 +40,7 @@
v-model="money"
class="pic-box-money pic-number-pic"
/>
</view>
</view> -->
</view>
<view class="tip">提示：充值后帐户的金额不能提现</view>
<view class="pay-btn bg-color-red" @click="recharge">立即充值</view>
@ -84,8 +84,8 @@ export default {
.then(res => {
this.picList = res.data.recharge_price_ways || [];
if (this.picList[0]) {
this.paid_price = this.picList[0].price;
this.numberPic = this.picList[0].give_price;
this.paid_price = this.picList[0].value.price;
this.numberPic = this.picList[0].value.give_price;
}
})
.catch(res => {
@ -107,8 +107,8 @@ export default {
this.numberPic = "";
} else {
this.money = "";
this.paid_price = item.give_price;
this.numberPic = item.price;
this.paid_price = item.value.give_price;
this.numberPic = item.value.price;
}
},
recharge: function() {

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

@ -313,6 +313,14 @@ export default {
});
return;
}
if (url === "/pages/orderAdmin/OrderCancellation/index" && !this.userInfo.checkStatus) {
uni.showToast({
title: "您没有核销权限,请后台店员设置！！",
icon: "none",
duration: 2000
});
return;
}
this.$yrouter.push({
path: this.MyMenus[index].uniapp_url

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

@ -8,7 +8,7 @@
<view>总资产(元)</view>
<view class="money">{{ now_money }}</view>
</view>
<!-- <navigator url="/pages/user/Recharge/index" class="recharge font-color-red">充值</navigator> -->
<navigator url="/pages/user/Recharge/index" class="recharge font-color-red">充值</navigator>
</view>
<view class="cumulative acea-row row-top">
<view class="item">

3
pages/user/address/AddAddress/index.vue
View File

@ -177,7 +177,8 @@ export default {
this.address = {
province: values.province.name || "",
city: values.city.name || "",
district: values.district.name || ""
district: values.district.name || "",
city_id: values.city.id
};
this.addressText = `${this.address.province}${this.address.city}${this.address.district}`;
// this.addressText =

54
pages/user/coupon/GetCoupon/index.vue
View File

@ -1,30 +1,35 @@
<template>
<view ref="container">
<view class="coupon-list" v-if="couponsList.length > 0">
<view
<div class="coupon-list" v-if="couponsList.length > 0">
<div
class="item acea-row row-center-wrapper"
v-for="(item, couponsListIndex) in couponsList"
:key="couponsListIndex"
v-for="(item, index) in couponsList"
:key="index"
>
<view class="money" :class="item.isUse ? 'moneyGray' : ''">
￥
<text class="num">{{ item.couponPrice }}</text>
</view>
<view class="text">
<view class="condition line1">购物满{{ item.useMinPrice }}元可用</view>
<view class="data acea-row row-between-wrapper">
<view v-if="item.endTime !== 0">
<data-format-t :date="item.startTime"></data-format-t>-
<data-format-t :date="item.endTime"></data-format-t>
</view>
<view v-else>不限时</view>
<view class="bnt gray" v-if="item.isUse === true">已领取</view>
<view class="bnt gray" v-else-if="item.isUse === 2">已领完</view>
<view class="bnt bg-color-red" v-else @click="getCoupon(item.id, couponsListIndex)">立即领取</view>
</view>
</view>
</view>
</view>
<div class="money" :class="item.isUse ? 'moneyGray' : ''">
<div>
￥
<span class="num">{{ item.couponPrice }}</span>
</div>
<div class="pic-num">满{{ item.useMinPrice }}元可用</div>
</div>
<div class="text">
<div class="condition line1">
<span class="line-title bg-color-check" v-if="item.ctype === 0">通用劵</span>
<span class="line-title bg-color-check" v-else-if="item.ctype === 1">商品券</span>
<span class="line-title bg-color-check" v-else>未知</span>
<span>{{ item.cname }}</span>
</div>
<div class="data acea-row row-between-wrapper">
<div v-if="item.endTime !== 0">{{ item.startTime }}-{{ item.endTime }}</div>
<div v-else>不限时</div>
<div class="bnt gray" v-if="item.isUse === true">已领取</div>
<div class="bnt gray" v-else-if="item.isUse === 2">已领完</div>
<div class="bnt bg-color-red" v-else @click="getCoupon(item.id, index)">立即领取</div>
</div>
</div>
</div>
</div>
<Loading :loaded="loadend" :loading="loading"></Loading>
<!--暂无优惠券-->
@ -76,7 +81,8 @@ export default {
})
.catch(function(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
});

6
pages/user/promotion/UserPromotion/index.vue
View File

@ -20,7 +20,7 @@
</view>
</view>
</view>
<view class="bnt bg-color-red" @click="toCash">立即提现</view>
<!-- <view class="bnt bg-color-red" @click="toCash">立即提现</view> -->
<view class="list acea-row row-between-wrapper">
<view class="item acea-row row-center-wrapper row-column" @click="goPoster()">
<text class="iconfont icon-erweima"></text>
@ -38,6 +38,10 @@
<text class="iconfont icon-dingdan"></text>
<view>推广人订单</view>
</view>
<view class="item acea-row row-center-wrapper row-column" @click="toCash()">
<text class="iconfont icon-chongzhi"></text>
<view>立即提现</view>
</view>
</view>
</view>
</template>