Skip to content

M
mallapp
Commit fc9d502c authored by 黄媛媛's avatar 黄媛媛
Browse files
Options

修改样式

parent c5c85008
Hide whitespace changes
Inline Side-by-side
Showing with 193 additions and 35 deletions
components/coupons/coupons.vue
View file @ fc9d502c
...@@ -5,7 +5,12 @@ ...@@ -5,7 +5,12 @@
<img src="../../static/images/couponsbg.png" mode="widthFix" /> <img src="../../static/images/couponsbg.png" mode="widthFix" />
<view class="coupons-box"> <view class="coupons-box">
<text style="font-size: 18px;color: #FFFFFF;">恭喜获得优惠券</text> <text style="font-size: 18px;color: #FFFFFF;">恭喜获得优惠券</text>
<text style="font-size: 14px;color: #FFFFFF;margin-top: 20rpx;">{{couponMessage}}</text>
<view class="btn" @click="goLook">
<text>立即查看</text>
</view>
</view> </view>
<u-icon name="close" style='position: absolute;right: 0;top: 0;' color="#FFFFFF" size="60" @click='closeBtn'></u-icon>
</view> </view>
</u-popup> </u-popup>
</div> </div>
...@@ -13,10 +18,10 @@ ...@@ -13,10 +18,10 @@
<script> <script>
export default { export default {
props: ['couponMessage'],
data() { data() {
return { return {
pageinfo: {}, pageinfo: {},
showDialog: true showDialog: true
}; };
}, },
...@@ -26,7 +31,15 @@ export default { ...@@ -26,7 +31,15 @@ export default {
}, },
methods: { methods: {
goLook(){
this.showDialog = false;
this.$emit('goLook');
},
closeBtn(){
this.showDialog = false;
this.$emit('closeBtn');
}
} }
}; };
...@@ -56,6 +69,20 @@ export default { ...@@ -56,6 +69,20 @@ export default {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
position: absolute;
left: 30rpx;
top: 320rpx;
}
.coupons-page .btn{
width: 330rpx;
height: 66rpx;
border-radius: 33rpx;
background: #FDE005;
display: flex;
align-items: center;
justify-content: center;
font-size: 36rpx;
color: #1A1A1A;
margin-top: 70rpx;
} }
</style> </style>
components/goods/list.vue
View file @ fc9d502c
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<view class="shipping" v-if=" (cx.freeShippingFullMoneyPinkage>0 || cx.freeShippingFullNumPinkage>0)"> <view class="shipping" v-if=" (cx.freeShippingFullMoneyPinkage>0 || cx.freeShippingFullNumPinkage>0)">
{{cx.freeShippingName!=null && cx.freeShippingName !=''?cx.freeShippingName+':':''}} {{cx.freeShippingName!=null && cx.freeShippingName !=''?cx.freeShippingName+':':''}}
{{cx.freeShippingFullMoneyPinkage>0 && cx.freeShippingFullNumPinkage==0?'满'+cx.freeShippingFullMoneyPinkage+'元包邮':''}} {{cx.freeShippingFullMoneyPinkage>0 && cx.freeShippingFullNumPinkage==0?'满'+cx.freeShippingFullMoneyPinkage+'元包邮':''}}
{{cx.freeShippingFullMoneyPinkage==0 && cx.freeShippingFullNumPinkage>0?'满'+cx.freeShippingFullNumPinkage+'元包邮':''}} {{cx.freeShippingFullMoneyPinkage==0 && cx.freeShippingFullNumPinkage>0?'满'+cx.freeShippingFullNumPinkage+'件包邮':''}}
</view> </view>
</view> </view>
<view class="good-name" v-if="setting.is_show_goods_name==1">{{ cx.name }}</view> <view class="good-name" v-if="setting.is_show_goods_name==1">{{ cx.name }}</view>
......
pages/goods/goods.vue
View file @ fc9d502c
...@@ -288,6 +288,12 @@ ...@@ -288,6 +288,12 @@
@changeuserinfo="reloadUserinfo" @changeuserinfo="reloadUserinfo"
@gbAuth="gbAuth" @gbAuth="gbAuth"
></auth> ></auth>
<coupon
v-if="showCoupons"
:couponMessage="couponMessage"
@goLook="goLook"
@closeBtn="closeBtn"
></coupon>
</view> </view>
</template> </template>
...@@ -299,6 +305,7 @@ import goodlist from "@/components/goods/list"; ...@@ -299,6 +305,7 @@ import goodlist from "@/components/goods/list";
import goodsaction from "./components/goodsaction"; import goodsaction from "./components/goodsaction";
import goodsku from "@/components/goods/goodsku"; import goodsku from "@/components/goods/goodsku";
import auth from "@/components/auth/index"; import auth from "@/components/auth/index";
import coupon from "@/components/coupons/coupons";
import share from "./components/share/share"; import share from "./components/share/share";
import hParse from "@/components/u-parse/parse.vue"; import hParse from "@/components/u-parse/parse.vue";
export default { export default {
...@@ -332,6 +339,8 @@ export default { ...@@ -332,6 +339,8 @@ export default {
CommentGrade: 0, CommentGrade: 0,
}, },
showAuth: false, showAuth: false,
showCoupons:false,
couponMessage:'测试',
isAllowShare:1, isAllowShare:1,
u: {}, u: {},
vipState:{}, vipState:{},
...@@ -342,6 +351,7 @@ export default { ...@@ -342,6 +351,7 @@ export default {
goodsaction, goodsaction,
goodsku, goodsku,
auth, auth,
coupon,
share, share,
hParse, hParse,
}, },
...@@ -363,6 +373,7 @@ export default { ...@@ -363,6 +373,7 @@ export default {
} }
if (option && option.user_id) { if (option && option.user_id) {
uni.setStorageSync("pid", { pid: option.user_id }); uni.setStorageSync("pid", { pid: option.user_id });
this.getReceive()
} }
if(uni.getStorageSync("AnchorName")){ //如果有主播名称了先清除 if(uni.getStorageSync("AnchorName")){ //如果有主播名称了先清除
uni.removeStorageSync('AnchorName'); uni.removeStorageSync('AnchorName');
...@@ -664,6 +675,35 @@ export default { ...@@ -664,6 +675,35 @@ export default {
openShare() { openShare() {
this.showShare = true; this.showShare = true;
}, },
getReceive(){//分享进入调取领券接口
// 1-分享，2-购买并付款
this.request2(
{
url: "/api/AppletUser/ShareCoupon",
data: {
TriggerType: 1,
},
},
(res) => {
console.log(res,'res')
if(res.couponResultCode ==1){
this.couponMessage = res.couponMessage
this.showCoupons = true;
}
}
);
},
goLook(){
this.showCoupons = true;
uni.navigateTo({
url: "/pages/coupon/index/index",
});
},
closeBtn(){
this.showCoupons = false
}
}, },
}; };
</script> </script>
......
pages/index/index.vue
View file @ fc9d502c
...@@ -79,6 +79,12 @@ ...@@ -79,6 +79,12 @@
<Text style='color: #fff;'>{{setting.add_app_text}}</Text> <Text style='color: #fff;'>{{setting.add_app_text}}</Text>
<view class="triangle-up"></view> <view class="triangle-up"></view>
</view> </view>
<coupon
v-if="showCoupons"
:couponMessage="couponMessage"
@goLook="goLook"
@closeBtn="closeBtn"
></coupon>
</view> </view>
</template> </template>
...@@ -101,6 +107,7 @@ import mapi from "@/components/mapi/index"; ...@@ -101,6 +107,7 @@ import mapi from "@/components/mapi/index";
import checkform from "@/components/checkform/index"; import checkform from "@/components/checkform/index";
import addialog from "@/components/addialog/index"; import addialog from "@/components/addialog/index";
import quicknav from "@/components/quicknav/index"; import quicknav from "@/components/quicknav/index";
import coupon from "@/components/coupons/coupons";
export default { export default {
data() { data() {
return { return {
...@@ -114,6 +121,8 @@ export default { ...@@ -114,6 +121,8 @@ export default {
setting:{}, setting:{},
add_show:1, add_show:1,
showtabs:true, showtabs:true,
showCoupons:false,
couponMessage:'',
}; };
}, },
components: { components: {
...@@ -134,7 +143,8 @@ export default { ...@@ -134,7 +143,8 @@ export default {
mapi, mapi,
checkform, checkform,
addialog, addialog,
quicknav quicknav,
coupon
}, },
onLoad(options) { onLoad(options) {
console.log(options,'option'); console.log(options,'option');
...@@ -154,8 +164,9 @@ export default { ...@@ -154,8 +164,9 @@ export default {
} }
if(options&&options.user_id){ if(options&&options.user_id){
uni.setStorageSync("pid", {pid:options.user_id}); uni.setStorageSync("pid", {pid:options.user_id});
this.getReceive()
} }
if(options&&options.scene){//兼容之前小程序的调转 if(options&&options.scene){//兼容之前小程序的调转
this.getjump(options.scene) this.getjump(options.scene)
...@@ -300,6 +311,34 @@ export default { ...@@ -300,6 +311,34 @@ export default {
}); });
}); });
}, },
getReceive(){//分享进入调取领券接口
// 1-分享，2-购买并付款
this.request2(
{
url: "/api/AppletUser/ShareCoupon",
data: {
TriggerType: 1,
},
},
(res) => {
console.log(res,'res')
if(res.couponResultCode ==1){
this.couponMessage = res.couponMessage
this.showCoupons = true;
}
}
);
},
goLook(){
this.showCoupons = true;
uni.navigateTo({
url: "/pages/coupon/index/index",
});
},
closeBtn(){
this.showCoupons = false
}
}, },
}; };
</script> </script>
......
pages/mySupplier/billDetails.vue
View file @ fc9d502c
...@@ -32,15 +32,20 @@ ...@@ -32,15 +32,20 @@
</view> </view>
<view class="box_r_b"> <view class="box_r_b">
<text style="font-size: 12px;color: #555555;">X{{x.Number}}</text> <text style="font-size: 12px;color: #555555;">X{{x.Number}}</text>
<view style="padding: 5px 10px;background: #F8F6F5;font-size: 12px;color: #111111;">
<text>已得佣金：</text>
<text style="color: #FF4048;font-size: 12px;">{{x.Final_Price}}</text>
<text>元</text>
</view>
</view> </view>
</view> </view>
</view> </view>
<view class="box_r_b">
<text style="font-size: 12px;color: #555555;"></text>
<view style="padding: 5px 10px;background: #F8F6F5;font-size: 12px;color: #111111;">
<text>已得佣金：</text>
<text style="color: #FF4048;font-size: 12px;">{{item.Commission}}</text>
<text>元</text>
</view>
</view>
<view class="OrderNoStyle" > <view class="OrderNoStyle" >
<text style="margin-left: 15px;">订单号:{{item.OrderNo}}</text> <text style="margin-left: 15px;">订单号:{{item.OrderNo}}</text>
</view> </view>
......
pages/mySupplier/myBill.vue
View file @ fc9d502c
...@@ -23,13 +23,18 @@ ...@@ -23,13 +23,18 @@
<view class="box_b" > <view class="box_b" >
<view class="box_b_t"> <view class="box_b_t">
<text>{{item.Periods}}</text> <text>{{item.Periods}}</text>
<text :style="{color:item.BillState==2?'#FF4048':'#111111','font-size':'16px'}">{{item.Money}}元</text> <view style="display: flex;flex-direction: row;align-items:center ;">
<text v-if="item.BillState == 1">待打款:</text>
<text v-if="item.BillState == 2">已打款:</text>
<text v-if="item.BillState == 3">驳回:</text>
<text :style="{color:item.BillState==2?'#FF4048':'#111111','font-size':'16px'}">{{item.Money}}元</text>
</view>
</view> </view>
<view class="box_b_b"> <view class="box_b_b">
<text>{{item.SupplierName}}</text> <text>{{item.SupplierName}}</text>
<text v-if="item.BillState == 1">待打款</text> <text style="font-size: 14px;">查看详情 >> </text>
<text v-if="item.BillState == 2">已打款</text>
<text v-if="item.BillState == 3">驳回</text>
</view> </view>
</view> </view>
</view> </view>
......
pages/mySupplier/mySupplierList.vue
View file @ fc9d502c
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
<view class="agreementbox" v-if='isshowagreement==true'></view> <view class="agreementbox" v-if='isshowagreement==true'></view>
<view class="agreementbox_t" v-if='isshowagreement==true'> <view class="agreementbox_t" v-if='isshowagreement==true'>
<view class="agreement_b"> <view class="agreement_b">
<view style="width: 100%;height: 45px;font-size: 14px;color: #000000;display: flex;flex-direction: row;border-bottom: 1px solid #E2E2E2;"> <view style="width: 100%;height: 45px;font-size: 14px;color: #000000;display: flex;flex-direction: row;border-bottom: 1px solid #E2E2E2;margin-top: -60px;">
<view class="popupstyle"> <view class="popupstyle">
<text>毛利率</text> <text>毛利率</text>
</view> </view>
...@@ -63,11 +63,12 @@ ...@@ -63,11 +63,12 @@
</view> </view>
</view> </view>
<u-icon name="close" style='position: absolute;left: 50%;bottom: -60px;margin-left: -30rpx;' color="#FFFFFF" size="60" @click='read'></u-icon>
<view class="agreement_bottom" :style="{background:mainColor}" @click="read"> <!-- <view class="agreement_bottom" :style="{background:mainColor}" @click="read">
<Text style='color: #fff;'>确定</Text> <Text style='color: #fff;'>确定</Text>
</view> </view> -->
</view> </view>
</view> </view>
</template> </template>
...@@ -259,7 +260,8 @@ ...@@ -259,7 +260,8 @@
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
overflow: hidden;
position: relative;
} }
.mySupplierList .agreementbox_t .agreement_bottom{ .mySupplierList .agreementbox_t .agreement_bottom{
width: 100%; width: 100%;
......
pages/mySupplier/supplierOrder.vue
View file @ fc9d502c
...@@ -258,11 +258,6 @@ ...@@ -258,11 +258,6 @@
this.msg.EndTime = EndTime this.msg.EndTime = EndTime
} }
} }
}, },
getUserMemberSupplier(){ getUserMemberSupplier(){
...@@ -273,9 +268,9 @@ ...@@ -273,9 +268,9 @@
}, },
(res) => { (res) => {
let obj = {ID:0,Name:'不限'}
this.array = res.data this.array = res.data
console.log(this.array) this.array.unshift(obj)
} }
); );
......
pages/order-submit/order-submit.vue
View file @ fc9d502c
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
</view> </view>
</template> </template>
<template> <template>
<view class="goodboxmore" style="font-size: 12px;color: #000000;display: flex;flex-direction: row;align-items: center;"> <view class="goodboxmore" style="font-size: 12px;color: #000000;display: flex;flex-direction: row;align-items: center;" v-if="x.pinkageList.length>0">
已满足: 已满足:
<view style="height: 22px;line-height: 22px;font-size: 12px;color: #ff9900;background: #fdf6ec;padding: 0 5px;" v-for="(y, yi) in x.pinkageList" :key="yi"> <view style="height: 22px;line-height: 22px;font-size: 12px;color: #ff9900;background: #fdf6ec;padding: 0 5px;" v-for="(y, yi) in x.pinkageList" :key="yi">
<text >{{y.Name}}</text> <text >{{y.Name}}</text>
......
pages/order-submit/pay-success.vue
View file @ fc9d502c
...@@ -32,14 +32,22 @@ ...@@ -32,14 +32,22 @@
<view style="padding: 12px;" v-if="recommend.length > 0"> <view style="padding: 12px;" v-if="recommend.length > 0">
<goodlist :list="recommend"></goodlist> <goodlist :list="recommend"></goodlist>
</view> </view>
<coupon
v-if="showCoupons"
:couponMessage="couponMessage"
@goLook="goLook"
@closeBtn="closeBtn"
></coupon>
</view> </view>
</template> </template>
<script> <script>
import goodlist from "@/components/goods/list"; import goodlist from "@/components/goods/list";
import coupon from "@/components/coupons/coupons";
export default { export default {
components: { components: {
goodlist, goodlist,
coupon
}, },
data() { data() {
return { return {
...@@ -54,6 +62,8 @@ export default { ...@@ -54,6 +62,8 @@ export default {
mainColor: "", mainColor: "",
recommend: [], recommend: [],
payInfo:{}, payInfo:{},
showCoupons:false,
couponMessage:'',
}; };
}, },
onLoad(option) { onLoad(option) {
...@@ -66,6 +76,7 @@ export default { ...@@ -66,6 +76,7 @@ export default {
this.mainColor = this.$uiConfig.mainColor; this.mainColor = this.$uiConfig.mainColor;
this.themCustomStyle.color = this.mainColor; this.themCustomStyle.color = this.mainColor;
this.themCustomStyle.borderColor = this.mainColor; this.themCustomStyle.borderColor = this.mainColor;
this.getReceive()
this.initRecommend(); this.initRecommend();
}, },
methods: { methods: {
...@@ -92,6 +103,34 @@ export default { ...@@ -92,6 +103,34 @@ export default {
url: "/pages/index/index", url: "/pages/index/index",
}); });
}, },
getReceive(){//分享进入调取领券接口
// 1-分享，2-购买并付款
this.request2(
{
url: "/api/AppletUser/ShareCoupon",
data: {
TriggerType: 2,
},
},
(res) => {
console.log(res,'res')
if(res.couponResultCode ==1){
this.couponMessage = res.couponMessage
this.showCoupons = true;
}
}
);
},
goLook(){
this.showCoupons = true;
uni.navigateTo({
url: "/pages/coupon/index/index",
});
},
closeBtn(){
this.showCoupons = false
}
}, },
}; };
</script> </script>
......
plugin/api.js
View file @ fc9d502c
...@@ -2,9 +2,9 @@ export default { ...@@ -2,9 +2,9 @@ export default {
install(Vue, options) { install(Vue, options) {
Vue.prototype.host = "https://wx.weibaoge.cn/web/index.php?_mall_id=1285" Vue.prototype.host = "https://wx.weibaoge.cn/web/index.php?_mall_id=1285"
// Vue.prototype.host2 = "http://192.168.0.110:8200" // Vue.prototype.host2 = "http://192.168.0.110:8200"
Vue.prototype.host2 = "https://mallApi.oytour.com" // Vue.prototype.host2 = "https://mallApi.oytour.com"
// Vue.prototype.host2 = "http://192.168.2.16:8088" // Vue.prototype.host2 = "http://192.168.2.16:8088"
// Vue.prototype.host2 = "http://192.168.2.65" Vue.prototype.host2 = "http://192.168.2.65"
Vue.prototype.request = function(param, success, failed) { Vue.prototype.request = function(param, success, failed) {
//网络请求 //网络请求
uni.request({ uni.request({
...@@ -56,12 +56,18 @@ export default { ...@@ -56,12 +56,18 @@ export default {
typeof failed == "function" && failed(res.data); typeof failed == "function" && failed(res.data);
} }
}else if(res.data.resultCode != 1) { }else if(res.data.resultCode != 1) {
uni.showToast({ if(res.data.couponResultCode==0){
title: res.data.message,
icon: "none", }else{
}); uni.showToast({
typeof failed == "function" && failed(res.data); title: res.data.message,
icon: "none",
});
}
typeof failed == "function" && failed(res.data);
} }
else{ else{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment