Skip to content

L
lumastoreapp
Commit fa4681d0 authored by home's avatar home
Browse files
Options

zxf

parents 7af45ea8 2fe885fc
Show whitespace changes
Inline Side-by-side
Showing with 1000 additions and 667 deletions
manifest.json
View file @ fa4681d0
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
//"appid" : "__UNI__FC9419E", //"appid" : "__UNI__FC9419E",
"appid" : "__UNI__1EA80F1", //这个是 web 的 "appid" : "__UNI__1EA80F1", //这个是 web 的
"description" : "商家", "description" : "商家",
"versionName" : "1.0.99", "versionName" : "1.1.00",
"versionCode" : 199, "versionCode" : 110,
"transformPx" : false, "transformPx" : false,
"compatible" : { "compatible" : {
"ignoreVersion" : true, //true表示忽略版本检查提示框，HBuilderX1.9.0及以上版本支持 "ignoreVersion" : true, //true表示忽略版本检查提示框，HBuilderX1.9.0及以上版本支持
...@@ -126,9 +126,9 @@ ...@@ -126,9 +126,9 @@
}, },
"splashscreen" : { "splashscreen" : {
"android" : { "android" : {
"hdpi" : "C:/Users/Administrator/Desktop/证书/d0abce82961b508e6a0b9924d15fe86.png", "hdpi" : "C:/Users/Administrator/Desktop/da/6b51802bba0a32ac69392831b1fc324.png",
"xhdpi" : "C:/Users/Administrator/Desktop/证书/d0abce82961b508e6a0b9924d15fe86.png", "xhdpi" : "C:/Users/Administrator/Desktop/da/6b51802bba0a32ac69392831b1fc324.png",
"xxhdpi" : "C:/Users/Administrator/Desktop/证书/d0abce82961b508e6a0b9924d15fe86.png" "xxhdpi" : "C:/Users/Administrator/Desktop/da/6b51802bba0a32ac69392831b1fc324.png"
}, },
"ios" : { "ios" : {
"iphone" : { "iphone" : {
......
pages/addEditEleProduct/addEditEleProduct.vue
View file @ fa4681d0
...@@ -341,6 +341,7 @@ ...@@ -341,6 +341,7 @@
}, },
data() { data() {
return { return {
linkage_id:'', linkage_id:'',
is_datashow:true, is_datashow:true,
bools:'', bools:'',
...@@ -430,6 +431,12 @@ ...@@ -430,6 +431,12 @@
], ],
isShow:false, isShow:false,
chindformList:[], chindformList:[],
myProps:{
label:'cate_name',
value: 'cate_id',
children: '',
},
//上传图片相关的 //上传图片相关的
c_pics: [], c_pics: [],
c_pics1:[], c_pics1:[],
...@@ -731,7 +738,6 @@ ...@@ -731,7 +738,6 @@
}, },
confirm(e){ confirm(e){
console.log(this.chindformList);return;
this.cate_name = e.item.cate_name; this.cate_name = e.item.cate_name;
this.form.cate_id =e.item.cate_id; this.form.cate_id =e.item.cate_id;
this.index = e.index; this.index = e.index;
...@@ -769,6 +775,7 @@ ...@@ -769,6 +775,7 @@
}, },
//修改的时候赋初始值 //修改的时候赋初始值
async eleProductInfofun(){ async eleProductInfofun(){
let that=this;
let res = await eleProductInfo({ let res = await eleProductInfo({
product_id:this.product_id, product_id:this.product_id,
}); });
...@@ -808,24 +815,32 @@ ...@@ -808,24 +815,32 @@
this.form.commission = res.data.commission, //返佣比例 this.form.commission = res.data.commission, //返佣比例
this.form.sell_type = res.data.sell_type, // 售卖类型 this.form.sell_type = res.data.sell_type, // 售卖类型
this.form.mandatory = res.data.mandatory this.form.mandatory = res.data.mandatory
if(typeof res.data.video_photos == 'object'){
this.video_photos=res.data.video_photos;//轮播 this.video_photos=res.data.video_photos;//轮播
this.detail_photos=res.data.detail_photos;//详情 for(let i in res.data.video_photos){
res.data.video_photos.map(item=>{ //轮播
this.c_pics1.push({ this.c_pics1.push({
code:0, code:0,
data:item, data:res.data.video_photos[i],
msg:"success", msg:"success",
time:"1587101904" time:"1587101904"
}) });
}) }
res.data.detail_photos.map(item=>{ //详情 }
if(typeof res.data.detail_photos == 'object'){
this.detail_photos=res.data.detail_photos;//详情
for(let i in res.data.detail_photos){
this.c_pics2.push({ this.c_pics2.push({
code:0, code:0,
data:item, data:res.data.detail_photos[i],
msg:"success", msg:"success",
time:"1587101904" time:"1587101904"
}) });
}) }
}
//下拉分类 初始值 //下拉分类 初始值
this.chindformList.forEach((item,index)=>{ this.chindformList.forEach((item,index)=>{
if(item.cate_id==res.data.cate_id){ if(item.cate_id==res.data.cate_id){
...@@ -834,6 +849,8 @@ ...@@ -834,6 +849,8 @@
} }
}); });
if(res.data.commodity_type == 'ordinary') { if(res.data.commodity_type == 'ordinary') {
this.ordinary.map(item=>{ this.ordinary.map(item=>{
if(this.linkage_product_id == item.product_id){ if(this.linkage_product_id == item.product_id){
......
pages/eleProduct/eleProduct.vue
View file @ fa4681d0
...@@ -230,9 +230,11 @@ ...@@ -230,9 +230,11 @@
this.goods_list = []; this.goods_list = [];
this.page = 1; this.page = 1;
this.isallshow=false; this.isallshow=false;
this.tabactive = 1,
// this.goods_product_list(); // this.goods_product_list();
this.searchProduct(); this.searchProduct();
}, },
computed: { computed: {
staticUrl () {//静态资源地址 staticUrl () {//静态资源地址
return this.$store.state.staticUrl; return this.$store.state.staticUrl;
......
pages/index/index.vue
View file @ fa4681d0
...@@ -368,15 +368,6 @@ ...@@ -368,15 +368,6 @@
} }
}, },
onLoad() { onLoad() {
getskipShop({
type: 'bld'
}).then(res => {
if (res.code == 0) {
this.is_bld = res.data.is_bld
// this.is_bld = 1
}
})
//显示欢迎回来~ //显示欢迎回来~
setTimeout(() => { setTimeout(() => {
this.$refs.Welcome.show(); this.$refs.Welcome.show();
...@@ -410,6 +401,16 @@ ...@@ -410,6 +401,16 @@
// uni.stopPullDownRefresh();//结束下拉刷新 // uni.stopPullDownRefresh();//结束下拉刷新
}, },
onShow() { onShow() {
getskipShop({
type: 'bld'
}).then(res => {
if (res.code == 0) {
this.is_bld = res.data.is_bld
// this.is_bld = 1
}
})
this.storeIndexfun(); this.storeIndexfun();
...@@ -439,7 +440,15 @@ ...@@ -439,7 +440,15 @@
activity_nucleus(param).then(res => { activity_nucleus(param).then(res => {
if (res.code == 0) { if (res.code == 0) {
this.$api.msg(res.msg); uni.showModal({
title:'提示',
content:res.msg,
showCancel:false,
confirmText:'确定',
success() {
}
})
}else{ }else{
this.$api.msg(res.msg); this.$api.msg(res.msg);
} }
......
pages/order/order.vue
View file @ fa4681d0
...@@ -333,6 +333,6 @@ ...@@ -333,6 +333,6 @@
} }
.orderlist{ .orderlist{
padding: 100upx 24upx 0 24upx;box-sizing: border-box; padding: 40upx 24upx 0 24upx;box-sizing: border-box;
} }
</style> </style>
pages/order/shoporderdetail/shoporderdetail.vue
View file @ fa4681d0
...@@ -36,10 +36,10 @@ ...@@ -36,10 +36,10 @@
</view> </view>
<view class="bt_min flex1">{{detail.shop_name}}</view> <view class="bt_min flex1">{{detail.shop_name}}</view>
</view> </view>
<view class="flex mt-30" v-for='(item,index) in detail.products' :key='index' > <view class="flex mt-30" v-for='(item,index) in detail.products' :key='index'>
<view class="tuimg br_10 ov"> <view class="tuimg br_10 ov">
<image class="imgs" :src="staticUrl+item.photo" v-if="item.photo"></image> <image class="imgs" :src="staticUrl+item.photo" v-if="item.photo"></image>
<image class="imgs" :src="staticUrl+detail.photo" v-else ></image> <image class="imgs" :src="staticUrl+detail.photo" v-else></image>
</view> </view>
<view class="flex1 ml-25 goodsboxs"> <view class="flex1 ml-25 goodsboxs">
<view class="sz_30 bt_hei twoline names" style="height:65upx">{{item.goods_name}}</view> <view class="sz_30 bt_hei twoline names" style="height:65upx">{{item.goods_name}}</view>
...@@ -78,6 +78,7 @@ ...@@ -78,6 +78,7 @@
<view class="name">订单编号</view> <view class="name">订单编号</view>
<view class="vlas">{{logs.order_sn}}</view> <view class="vlas">{{logs.order_sn}}</view>
</view> </view>
<view class="cellitems flex ali-c jus-b"> <view class="cellitems flex ali-c jus-b">
<view class="name">创建时间</view> <view class="name">创建时间</view>
<view class="vlas">{{logs.createtime}}</view> <view class="vlas">{{logs.createtime}}</view>
...@@ -87,10 +88,14 @@ ...@@ -87,10 +88,14 @@
<view class="vlas">{{detail.refund_details}}</view> <view class="vlas">{{detail.refund_details}}</view>
</view> </view>
<view class="cellitems flex ali-c jus-b" >
<view class="name" style="width: 30%;">订单备注:</view>
<view class="vlas" style="text-align: left;">{{detail.message==''?'无':detail.message}}</view>
</view>
</view> </view>
<!-- 订单信息 --> <!-- 订单信息 -->
<!-- 联系客服 --> <!-- 联系客服 -->
<view class="ordertelbox flex "> <view class="ordertelbox flex ">
<view class="itemboxss flex1 flex flexc" @tap="xlsj" :data-tel='detail.addr.mobile'> <view class="itemboxss flex1 flex flexc" @tap="xlsj" :data-tel='detail.addr.mobile'>
...@@ -111,17 +116,23 @@ ...@@ -111,17 +116,23 @@
</template> </template>
<script> <script>
import { orderDetails } from "@/utils/api/api.js"; import {
orderDetails
} from "@/utils/api/api.js";
export default { export default {
data(){ data() {
return { return {
order_id:"", order_id: "",
detail:{addr:{mobile:""}}, detail: {
logs:{}, addr: {
mobile: ""
}
},
logs: {},
} }
}, },
computed: { computed: {
staticUrl () {//静态资源地址 staticUrl() { //静态资源地址
return this.$store.state.staticUrl; return this.$store.state.staticUrl;
} }
}, },
...@@ -129,14 +140,14 @@ ...@@ -129,14 +140,14 @@
this.order_id = options.order_id; this.order_id = options.order_id;
this.initializedata(); this.initializedata();
}, },
methods:{ methods: {
xlsj(){//联系客户 xlsj() { //联系客户
uni.makePhoneCall({ uni.makePhoneCall({
phoneNumber: this.detail.addr.mobile //仅为示例 phoneNumber: this.detail.addr.mobile //仅为示例
}); });
}, },
//联系平台 //联系平台
lxpt(){ lxpt() {
uni.makePhoneCall({ uni.makePhoneCall({
phoneNumber: '15907083784' //仅为示例 phoneNumber: '15907083784' //仅为示例
}); });
...@@ -148,10 +159,10 @@ ...@@ -148,10 +159,10 @@
}; };
orderDetails(params).then(res => { orderDetails(params).then(res => {
console.log(res); console.log(res);
if(res.code<0){ if (res.code < 0) {
// app.showToast({title: res.msg}); // app.showToast({title: res.msg});
this.$api.msg(res.msg); this.$api.msg(res.msg);
}else{ } else {
// that.setData({ // that.setData({
// detail: res.data.detail, // detail: res.data.detail,
// logs:res.data.logs, // logs:res.data.logs,
...@@ -164,7 +175,7 @@ ...@@ -164,7 +175,7 @@
} }
}) })
}, },
callTel: function (e) { callTel: function(e) {
uni.makePhoneCall({ uni.makePhoneCall({
phoneNumber: e.currentTarget.dataset.tel // 仅为示例，并非真实的电话号码 phoneNumber: e.currentTarget.dataset.tel // 仅为示例，并非真实的电话号码
}) })
...@@ -178,26 +189,32 @@ ...@@ -178,26 +189,32 @@
<style lang="scss"> <style lang="scss">
/* pages/shop//order/weidianorder/weidianLine_item/weidianLine_item.wxss */ /* pages/shop//order/weidianorder/weidianLine_item/weidianLine_item.wxss */
.ml-20{ .ml-20 {
margin-left: 20upx; margin-left: 20upx;
} }
.mt-20{
.mt-20 {
margin-top: 20upx; margin-top: 20upx;
} }
.mr-20{
.mr-20 {
margin-right: 20upx; margin-right: 20upx;
} }
.mt-30{
.mt-30 {
margin-top: 30upx; margin-top: 30upx;
} }
.ml-25{
.ml-25 {
margin-left: 25upx; margin-left: 25upx;
} }
.sz_30{
.sz_30 {
font-size: 30upx; font-size: 30upx;
} }
.beijingimg { .beijingimg {
background: linear-gradient(#FF5A03,#FF4216); background: linear-gradient(#FF5A03, #FF4216);
width: 100%; width: 100%;
height: 300upx; height: 300upx;
position: absolute; position: absolute;
...@@ -205,140 +222,164 @@ ...@@ -205,140 +222,164 @@
z-index: 1; z-index: 1;
padding-left: 20upx; padding-left: 20upx;
padding-top: 25px; padding-top: 25px;
.onetitle{
color:#FFFFFF; .onetitle {
color: #FFFFFF;
font-size: 30upx; font-size: 30upx;
} }
.twotitle{
color:#FFFFFF; .twotitle {
color: #FFFFFF;
font-size: 28upx; font-size: 28upx;
} }
} }
.addresone{ .addresone {
margin-top: 20px; margin-top: 20px;
} }
.boxs { .boxs {
position: relative; position: relative;
z-index:2; z-index: 2;
width: 100%; width: 100%;
padding: 24upx; padding: 24upx;
box-sizing: border-box; box-sizing: border-box;
} }
.bt_min{
.bt_min {
font-size: 30upx; font-size: 30upx;
} }
.addrnamesv{
.addrnamesv {
font-size: 30upx; font-size: 30upx;
} }
.topbox_20 { .topbox_20 {
width: 100%; width: 100%;
background: rgba(255,255,255,1); background: rgba(255, 255, 255, 1);
border-radius: 14rpx; border-radius: 14rpx;
padding: 20upx; padding: 20upx;
box-sizing: border-box; box-sizing: border-box;
font-size: 30upx; font-size: 30upx;
} }
.skunames{ .skunames {
font-size: 24upx; font-size: 24upx;
} }
page{ page {
position: relative; position: relative;
padding-bottom: 100upx; padding-bottom: 100upx;
background: #F5F5F5; background: #F5F5F5;
} }
.weizhiimg{
.weizhiimg {
width: 30upx; width: 30upx;
height: 46upx; height: 46upx;
.imgs{
.imgs {
width: 30upx; width: 30upx;
height: 46upx; height: 46upx;
} }
} }
.shuwuimg{
width:67upx; .shuwuimg {
height:67upx; width: 67upx;
border-radius:4upx; height: 67upx;
border-radius: 4upx;
overflow: hidden; overflow: hidden;
} }
.btbox{
width:190upx; .btbox {
height:77upx; width: 190upx;
background:rgba(255,255,255,1); height: 77upx;
border-radius:4upx; background: rgba(255, 255, 255, 1);
border-radius: 4upx;
} }
.xiangyouimg{
width:14upx; .xiangyouimg {
height:24upx; width: 14upx;
height: 24upx;
} }
.dianhuimg{
width:42upx; .dianhuimg {
height:42upx; width: 42upx;
height: 42upx;
} }
.kuai{
width:40upx; .kuai {
height:40upx; width: 40upx;
height: 40upx;
text-align: center; text-align: center;
line-height: 40upx; line-height: 40upx;
font-size:24upx; font-size: 24upx;
font-weight:500; font-weight: 500;
color:rgba(255,255,255,1); color: rgba(255, 255, 255, 1);
} }
.dibu_qr{ .dibu_qr {
position: fixed; position: fixed;
bottom: 0; bottom: 0;
width:100%; width: 100%;
background:rgba(255,255,255,1); background: rgba(255, 255, 255, 1);
padding: 10upx 24upx; padding: 10upx 24upx;
box-sizing: border-box; box-sizing: border-box;
} }
.beizhu{
.beizhu {
width: 150upx; width: 150upx;
text-align: right; text-align: right;
} }
.tubiimg{
width:27upx; .tubiimg {
height:24upx; width: 27upx;
.imgs{ height: 24upx;
width:27upx;
height:24upx; .imgs {
width: 27upx;
height: 24upx;
} }
} }
.tuimg{
width:183upx; .tuimg {
height:183upx; width: 183upx;
.imgs{ height: 183upx;
width:183upx;
height:183upx; .imgs {
width: 183upx;
height: 183upx;
} }
} }
view{
view {
line-height: 112%; line-height: 112%;
letter-spacing:3upx letter-spacing: 3upx
} }
.dianhuimg{
width:43upx; .dianhuimg {
height:43upx; width: 43upx;
height: 43upx;
} }
.shuxian{
width:1px; .shuxian {
height:100upx; width: 1px;
background:rgba(242,242,242,1); height: 100upx;
background: rgba(242, 242, 242, 1);
} }
.duanxian{
width:45upx; .duanxian {
height:1px; width: 45upx;
background: rgba(181,181,181,1); height: 1px;
background: rgba(181, 181, 181, 1);
} }
.cptjimg{
width:100%; .cptjimg {
height:310upx; width: 100%;
height: 310upx;
} }
/* 取消弹窗 */ /* 取消弹窗 */
.zan-dialog__mask { .zan-dialog__mask {
position: fixed; position: fixed;
...@@ -373,91 +414,106 @@ ...@@ -373,91 +414,106 @@
display: block; display: block;
} }
.goodsboxs{ .goodsboxs {
font-size: 30upx; font-size: 30upx;
.names{
.names {
font-size: 30upx; font-size: 30upx;
} }
.prices{
.prices {
font-size: 30upx; font-size: 30upx;
} }
.sumns{
color:rgb(192, 190, 190); .sumns {
color: rgb(192, 190, 190);
} }
} }
//联系kefu 客服 //联系kefu 客服
.ordertelbox{ .ordertelbox {
margin: 0 24upx; margin: 0 24upx;
margin-top: 20upx; margin-top: 20upx;
height:89upx; height: 89upx;
background:rgba(255,255,255,1); background: rgba(255, 255, 255, 1);
border-radius:0px 0px 14upx 14upx; border-radius: 0px 0px 14upx 14upx;
.itemboxss{
.itemboxss {
position: relative; position: relative;
height: 89upx; height: 89upx;
line-height: 89upx; line-height: 89upx;
.img{
width:43upx; .img {
height:43upx; width: 43upx;
height: 43upx;
margin-right: 20upx; margin-right: 20upx;
} }
.name{
font-size:30upx; .name {
color:rgba(0,0,0,1); font-size: 30upx;
color: rgba(0, 0, 0, 1);
} }
} }
.itemboxss:nth-child(1):after{ .itemboxss:nth-child(1):after {
content: ""; content: "";
width:1px; width: 1px;
height:89px; height: 89px;
background:rgba(242,242,242,1); background: rgba(242, 242, 242, 1);
position: absolute; position: absolute;
top:0; top: 0;
right: 0; right: 0;
} }
} }
//客服end //客服end
//价格明细列表 //价格明细列表
.cellboxs{ .cellboxs {
margin: 20upx 0; margin: 20upx 0;
margin-top: 20upx; margin-top: 20upx;
.cellitems{
.cellitems {
padding: 0 20upx; padding: 0 20upx;
height: 88upx; height: 88upx;
line-height: 88upx; line-height: 88upx;
border-bottom: 1px solid #F5F1F1; border-bottom: 1px solid #F5F1F1;
background: #FFFFFF; background: #FFFFFF;
.name{
font-size:30upx; .name {
color:rgba(0,0,0,1); font-size: 30upx;
color: rgba(0, 0, 0, 1);
} }
.vlas{
font-size:30upx; .vlas {
color:rgba(0,0,0,1); font-size: 30upx;
color: rgba(0, 0, 0, 1);
} }
} }
.cellitems:nth-last-child(1){
border:0; .cellitems:nth-last-child(1) {
border: 0;
} }
.subsbox{
.name{ .subsbox {
font-size:30upx; .name {
font-family:PingFang SC; font-size: 30upx;
font-weight:bold; font-family: PingFang SC;
color:rgba(0,0,0,1); font-weight: bold;
color: rgba(0, 0, 0, 1);
} }
.vlas{
color:#FF6900; .vlas {
.fuhao{ color: #FF6900;
.fuhao {
font-size: 30upx; font-size: 30upx;
} }
.shuzi{
font-family:PingFang SC; .shuzi {
font-weight:bold; font-family: PingFang SC;
font-weight: bold;
font-size: 36upx; font-size: 36upx;
} }
} }
......
pages/publishActivities/activityDetail/activityDetail.vue
View file @ fa4681d0
<template> <template>
<view> <view>
<view class="projuctTab flex">
<view class="tabitems flex1" :class="{active:tabactive==1}" @tap="taggletab(1)">
<view class="tabtitle">参与人员</view>
<!-- （{{count[0]}}） -->
</view>
<view class="tabitems flex1" :class="{active:tabactive==2}" @tap="taggletab(2)">
<view class="tabtitle">核销人员</view>
<!-- （{{count[1]}}） -->
</view>
</view>
<view class="" style="margin-top:90upx ;" :hidden="!(tabactive==1)">
<view class=""> <view class="">
<view class="" style="text-align: center;height: 120upx;line-height: 120upx;font-weight: bold;font-size: 32upx;"> <view class="" style="text-align: center;height: 120upx;line-height: 120upx;font-weight: bold;font-size: 32upx;">
已有 <text style="color: #21B94C;font-size: 60upx;">{{receivePeopleNumber}}</text>人领取 还剩{{unreceivePeopleNumber}}人未核销
已有 <text style="color: #21B94C;font-size: 60upx;">{{receivePeopleNumber}}</text>人参与
</view>
</view>
<view class="" style="height: 100upx;padding: 0 24upx;background-color: rgb(255, 255, 255);margin-bottom: 2upx;"v-for="(item,index) in getAllDetail">
<view class="fx " style="justify-content: space-between;background-color: #fff; align-items: center;height: 100%">
<view class="fx" style="width: 75%;align-items: center;">
<view style="height: 80upx;width: 80upx;border-radius: 120upx;text-align: center;line-height: 80upx;overflow: hidden;">
<image :src="item.face" style="display: inline;"></image>
</view>
<view style="margin:0 0 0 10upx;width: 75%;padding: 20upx 10upx;">
<view style="font: 34upx 微软雅黑;padding-bottom:10upx ;" class="oneline">{{item.nickname}}</view>
<view style="font-size:20upx;color:rgb(116, 113, 113);padding-top: 10upx;">{{item.create_time}}</view>
</view>
</view>
<view style="width: 15%;height: 104upx;">
<!-- <image src="/static/lingqu.png" mode="" style="width:100% ;height: 100%;display: inline;"></image> -->
</view>
<!-- 关注插槽 -->
<!-- <slot name="before"></slot> -->
</view>
<!-- <slot name="content"> </slot> -->
</view>
<view v-if="getAllDetail.length <= 0" style="text-align: center;width: 100%;height:1000upx;line-height: 1000upx;font-size: 50upx;color:#8C8C8C ;">
<image src="https://luma.jxdsy.cn//static/applet5/images/uts/meiyoule.png" mode=""></image>
</view> </view>
</view> </view>
<view class="" style="height: 160upx;padding: 0 24upx;background-color: rgb(255, 255, 255);margin-bottom: 20upx;" v-if="getDetail.length > 0 " v-for="(item,index) in getDetail">
<view class="" style="margin-top:90upx ;" :hidden="tabactive==1">
<view class="">
<view class="" style="text-align: center;height: 120upx;line-height: 120upx;font-weight: bold;font-size: 32upx;">
已有 <text style="color: #21B94C;font-size: 60upx;">{{enterPeopleNumber}}</text>人核销
</view>
</view>
<view class="" style="height: 100upx;padding: 0 24upx;background-color: rgb(255, 255, 255);margin-bottom: 2upx;"
v-for="(item,index) in getScanDetail">
<view class="fx " style="justify-content: space-between;background-color: #fff; align-items: center; <view class="fx " style="justify-content: space-between;background-color: #fff; align-items: center;
height: 100%"> height: 100%">
<view class="fx" style="width: 75%;align-items: center;" > <view class="fx" style="width: 75%;align-items: center;">
<view style="height: 120upx;width: 120upx;border-radius: 120upx;text-align: center;line-height: 80upx;overflow: hidden;"> <view style="height: 80upx;width: 80upx;border-radius: 120upx;text-align: center;line-height: 80upx;overflow: hidden;">
<image :src="item.face" style="display: inline;"></image> <image :src="item.face" style="display: inline;"></image>
</view> </view>
...@@ -20,10 +80,8 @@ ...@@ -20,10 +80,8 @@
</view> </view>
<view style="width: 15%;height: 104upx;"> <view style="width: 10%;height: 70upx;">
<!-- <text style="color:#DC143C;padding: 0 12upx;border-radius: 10upx;font-size: 32upx;">
</text> -->
<image src="/static/lingqu.png" mode="" style="width:100% ;height: 100%;display: inline;"></image> <image src="/static/lingqu.png" mode="" style="width:100% ;height: 100%;display: inline;"></image>
</view> </view>
<!-- 关注插槽 --> <!-- 关注插槽 -->
...@@ -33,11 +91,12 @@ ...@@ -33,11 +91,12 @@
<!-- <slot name="content"> </slot> --> <!-- <slot name="content"> </slot> -->
</view> </view>
<view v-if="getScanDetail.length <= 0" style="text-align: center;width: 100%;height:1000upx;line-height: 1000upx;font-size: 50upx;color:#8C8C8C ;">
<image src="https://luma.jxdsy.cn//static/applet5/images/uts/meiyoule.png" mode=""></image>
</view>
</view>
<view v-if="getDetail.length <= 0" style="text-align: center;width: 100%;height:1000upx;line-height: 1000upx;font-size: 50upx;color:#8C8C8C ;">
还没有人领取~~
</view>
</view> </view>
</template> </template>
...@@ -46,82 +105,263 @@ ...@@ -46,82 +105,263 @@
activity_user activity_user
} from '@/utils/api/merchant.js'; } from '@/utils/api/merchant.js';
export default { export default {
data(){ data() {
return { return {
shop_id:'', shop_id: '',
activity_id:'', activity_id: '',
getDetail:[], getAllDetail: [], // 参与人员列表
page:1, getScanDetail: [], //核销人员列表
receivePeopleNumber:0, allpage: 0, // 参与人员分页数
unreceivePeopleNumber:0, scanpage: 0, //核销人员分页数
enterPeopleNumber:0,//核销人数
receivePeopleNumber: 0, //参与人数
// unreceivePeopleNumber: 0,
tabactive: 1,
} }
}, },
onLoad(options) {
let that = this
that.activity_id = options.activity_id
uni.getStorage({
key: 'userInfo',
success(res) {
that.shop_id = res.data.shop_id
}
})
this.activityUserAll(that.shop_id, that.activity_id); //获取参与人员
},
/**
* 触底事件
*/
onReachBottom() { onReachBottom() {
// console.log('触底了',this.tabactive)
if (this.tabactive == 1) {
this.allpage++
// this.activityUserAll(this.shop_id, this.activity_id, 0, this.allpage)
activity_user({ activity_user({
shop_id:this.shop_id, shop_id: shop_id,
activity_id:this.activity_id, activity_id: activity_id,
nucleus:1, nucleus: 0,
page:this.page page: this.allpage
}).then(res=>{ }).then(res => {
if(res.code==0&&res.data.list.length>0){ if (res.code == 0) {
this.page++ this.getScanDetail =[...this.getScanDetail,...res.data.list]
this.getDetail = res.data.list;
this.receivePeopleNumber=res.data.receivePeopleNumber; this.receivePeopleNumber = res.data.receivePeopleNumber;
this.unreceivePeopleNumber=res.data.unreceivePeopleNumber; // this.unreceivePeopleNumber = res.data.unreceivePeopleNumber;
uni.stopPullDownRefresh(); }
}else{ })
uni.$api.msg('没有更多数据了') } else if (this.tabactive == 2) {
this.scanpage++
activity_user({
shop_id: shop_id,
activity_id: activity_id,
nucleus: 1,
page: this.scanpage
}).then(res => {
if (res.code == 0) {
this.getScanDetail =[this.getScanDetail,...res.data.list]
this.enterPeopleNumber = res.data.receivePeopleNumber;
// this.unreceivePeopleNumber = res.data.unreceivePeopleNumber;
} }
}) })
// this.activityUserScan(this.shop_id, this.activity_id, 1, this.scanpage)
} else {
return false;
}
}, },
/**
* 下拉刷新
*/
onPullDownRefresh() { onPullDownRefresh() {
this.page = 1 this.allpage = 1
activity_user({ this.scanpage = 1
shop_id:this.shop_id,
activity_id:this.activity_id, this.activityUserAll(this.shop_id, this.activity_id, )
nucleus:1
}).then(res=>{ this.activityUserScan(this.shop_id, this.activity_id)
if(res.code==0){
this.getDetail = res.data.list
this.receivePeopleNumber=res.data.receivePeopleNumber;
this.unreceivePeopleNumber=res.data.unreceivePeopleNumber;
uni.stopPullDownRefresh(); uni.stopPullDownRefresh();
},
methods: {
taggletab(index) {
this.tabactive = index;
if (index == 1) {
this.activityUserAll(this.shop_id, this.activity_id, )
} else if (index == 2) {
this.activityUserScan(this.shop_id, this.activity_id)
} }
})
}, },
onLoad(options) {
let that = this /**
that.activity_id = options.activity_id * @param {Number} nucleus
uni.getStorage({ * @param {Number} activity_id
key: 'userInfo', * @param {Number} shop_id
success(res) { */
that.shop_id = res.data.shop_id activityUserAll(shop_id, activity_id, nucleus = 0, pages = 0) {
activity_user({
shop_id: shop_id,
activity_id: activity_id,
nucleus: nucleus,
page: pages
}).then(res => {
if (res.code == 0) {
this.getAllDetail =res.data.list
this.receivePeopleNumber = res.data.receivePeopleNumber;
// this.unreceivePeopleNumber = res.data.unreceivePeopleNumber;
} }
}) })
},
/**
* @param {Number} nucleus
* @param {Number} activity_id
* @param {Number} shop_id
*/
activityUserScan(shop_id, activity_id, nucleus = 1, pages = 0) {
activity_user({ activity_user({
shop_id:that.shop_id, shop_id: shop_id,
activity_id:that.activity_id, activity_id: activity_id,
nucleus:1 nucleus: nucleus,
}).then(res=>{ page: pages
if(res.code==0){ }).then(res => {
this.getDetail = res.data.list; if (res.code == 0) {
this.receivePeopleNumber=res.data.receivePeopleNumber; this.getScanDetail =res.data.list
this.unreceivePeopleNumber=res.data.unreceivePeopleNumber;
this.enterPeopleNumber = res.data.receivePeopleNumber;
// this.unreceivePeopleNumber = res.data.unreceivePeopleNumber;
} }
}) })
}
}, },
} }
</script> </script>
<style> <style lang="scss">
page{ .projuctlist {
background-color: #EEEEEE; margin: 130upx 24upx;
padding-top: 18upx;
background: rgba(255, 255, 255, 1);
border-radius: 14upx;
.itempro {
position: relative;
border-bottom: 1px solid rgba(220, 220, 220, 1);
padding: 20upx;
.thumbnail {
width: 170upx;
height: 170upx;
border-radius: 6upx;
margin-right: 27upx;
margin-left: 20upx;
} }
.infobox {
.title {
font-size: 34upx;
color: rgba(51, 51, 51, 1);
//margin-bottom: 5upx;
}
.time {
//margin-bottom: 5upx;
}
.time,
.price {
font-size: 30upx;
color: rgba(153, 153, 153, 1);
}
}
.btnbox {
position: absolute;
bottom: 5px;
right: 5px;
.btns {
width: 100upx;
height: 60upx;
line-height: 60upx;
text-align: center;
border: 1upx solid rgba(160, 160, 160, 1);
border-radius: 4upx;
font-size: 30upx;
color: rgba(0, 0, 0, 1);
}
.btnboxdel {
margin-left: 16upx;
}
.btnboxxj {
background: #FF6900;
color: #FFFFFF;
border: 0;
margin-left: 16upx;
}
}
}
}
.projuctTab {
background: #FFFFFF;
width: 100%;
height: 98upx;
line-height: 98upx;
position: fixed;
top: 0;
/* #ifdef H5 */
top: 86upx;
/* #endif */
left: 0;
z-index: 99;
.tabitems {
text-align: center;
.tabtitle {
text-align: center;
height: 98upx;
line-height: 98upx;
font-size: 30upx;
display: inline-block;
box-sizing: border-box;
color: #333333;
}
}
.tabitems.active {
.tabtitle {
font-family: PingFang SC;
font-weight: bold;
color: #FF6900;
border-bottom: 1px solid #FF6900;
}
}
}
.fx { .fx {
display: flex; display: flex;
} }
......
pages/publishActivities/activityList/activityList.vue
View file @ fa4681d0
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<view class="projuctlist" :hidden="!(tabactive==1)"> <view class="projuctlist" :hidden="!(tabactive==1)">
<view class="" v-if="start_activity.length>0"> <view class="" v-if="start_activity.length>0">
<checkbox-group > <checkbox-group>
<!-- 单个商品 --> <!-- 单个商品 -->
<view class="itempro flex " v-for="(item,index) in start_activity" :key="index" @click="jumpDetail(item.activity_id)"> <view class="itempro flex " v-for="(item,index) in start_activity" :key="index" @click="jumpDetail(item.activity_id)">
<!-- <label class="ali-c"> <!-- <label class="ali-c">
...@@ -23,22 +23,25 @@ ...@@ -23,22 +23,25 @@
</label> --> </label> -->
<image class="thumbnail" :src="staticUrl + item.picture" mode=""></image> <image class="thumbnail" :src="staticUrl + item.picture" mode=""></image>
<view class="infobox" style="width: 70%;"> <view class="infobox" style="width: 70%;">
<view class="title oneline" style="height:45upx ;">{{item.goods_name}}</view> <view class="title oneline" style="height:45upx ;">{{item.goods_name}}</view>
<!-- <view class="time">上架时间：{{item.create_time}}</view> --> <!-- <view class="time">上架时间：{{item.create_time}}</view> -->
<view> <view>
<view style="font-size:26rpx;font-weight:bold;">领取时间：</view> <view style="font-size:26rpx;font-weight:bold;">领取时间：</view>
<view style="font-size:24rpx;color:#656565">{{item.start}}—{{item.end}}</view> <view style="font-size:24rpx;color:#656565">{{item.start}}—{{item.end}}</view>
</view> </view>
</view> </view>
<view class="btnbox flex" > <view class="btnbox flex">
<!-- <view class="btns btnboxdel" @tap="deleteEleProductfun(item,index)">删 除</view> --> <!-- <view class="btns btnboxdel" @tap="deleteEleProductfun(item,index)">删 除</view> -->
<!-- <view class="btns btnboxxj" @tap="Selectiondata(item)" v-if="tabactive==1 && isselect==1">加入活动</view> --> <!-- <view class="btns btnboxxj" @tap="Selectiondata(item)" v-if="tabactive==1 && isselect==1">加入活动</view> -->
<!-- <view class="btns btnboxxj" @tap="sold_outfun(item.id,1,index)" v-else-if="tabactive==1">下 架</view> --> <!-- <view class="btns btnboxxj" @tap="sold_outfun(item.id,1,index)" v-else-if="tabactive==1">下 架</view> -->
<!-- <view class="btns btnboxxj" @tap="sold_outfun(item.id,0,index)" v-show="tabactive==2">上 架</view> --> <!-- <view class="btns btnboxxj" @tap="sold_outfun(item.id,0,index)" v-show="tabactive==2">上 架</view> -->
<!-- <view class="btns btnboxxj" @click="setSpecs(item.product_id)" >规格</view> --> <!-- <view class="btns btnboxxj" @click="setSpecs(item.product_id)" >规格</view> -->
<view > <view>
<view class="btnboxdel flex" style="align-items: center;" @click.stop="switch1Change"> <view class="btnboxdel flex" style="align-items: center;" @click.stop="switch1Change">
活动开关：<switch :data-activity_id="item.activity_id" :checked="item.state==1" @change="switch1Change" /> 活动开关：
<switch :data-activity_id="item.activity_id" :checked="item.state==1" @change="switch1Change" />
<view class="btns btnboxdel" @tap.stop="tochanges(item,index)">修 改</view> <view class="btns btnboxdel" @tap.stop="tochanges(item,index)">修 改</view>
</view> </view>
</view> </view>
...@@ -49,14 +52,14 @@ ...@@ -49,14 +52,14 @@
</view> </view>
<view v-if="start_activity.length <= 0" style="text-align: center;width: 100%;height:1000upx;line-height: 1000upx;font-size: 50upx;color:#8C8C8C ;"> <view v-if="start_activity.length <= 0" style="text-align: center;width: 100%;height:1000upx;line-height: 1000upx;font-size: 50upx;color:#8C8C8C ;">
还没有人领取~~ <image src="https://luma.jxdsy.cn//static/applet5/images/uts/meiyoule.png" mode=""></image>
</view> </view>
</view> </view>
<view class="projuctlist" :hidden="!(tabactive==2)"> <view class="projuctlist" :hidden="!(tabactive==2)">
<view class="" v-if="end_activity.length > 0"> <view class="" v-if="end_activity.length > 0">
<checkbox-group > <checkbox-group>
<!-- 单个商品 --> <!-- 单个商品 -->
<view class="itempro flex " v-for="(item,index) in end_activity" :key="index" @click="jumpDetail(item.activity_id)"> <view class="itempro flex " v-for="(item,index) in end_activity" :key="index" @click="jumpDetail(item.activity_id)">
<!-- <label class="ali-c"> <!-- <label class="ali-c">
...@@ -86,7 +89,7 @@ ...@@ -86,7 +89,7 @@
</checkbox-group> </checkbox-group>
</view> </view>
<view v-if="end_activity.length <= 0" style="text-align: center;width: 100%;height:1000upx;line-height: 1000upx;font-size: 50upx;color:#8C8C8C ;"> <view v-if="end_activity.length <= 0" style="text-align: center;width: 100%;height:1000upx;line-height: 1000upx;font-size: 50upx;color:#8C8C8C ;">
还没有人领取~~ <image src="https://luma.jxdsy.cn//static/applet5/images/uts/meiyoule.png" mode=""></image>
</view> </view>
</view> </view>
...@@ -109,8 +112,8 @@ ...@@ -109,8 +112,8 @@
page: 0, page: 0,
start_activity: [], start_activity: [],
end_activity: [], end_activity: [],
endpages:0, endpages: 0,
startpages:0 startpages: 0
} }
}, },
...@@ -130,8 +133,8 @@ ...@@ -130,8 +133,8 @@
}) })
}, },
//下拉刷新 //下拉刷新
onPullDownRefresh(){ onPullDownRefresh() {
if(this.tabactive == 1){ if (this.tabactive == 1) {
this.startpages = 0 this.startpages = 0
activity_select({ activity_select({
shop_id: this.shop_id, shop_id: this.shop_id,
...@@ -144,7 +147,7 @@ ...@@ -144,7 +147,7 @@
} }
}) })
}else if(this.tabactive == 2){ } else if (this.tabactive == 2) {
this.endpages = 0 this.endpages = 0
activity_select({ activity_select({
shop_id: this.shop_id, shop_id: this.shop_id,
...@@ -161,7 +164,7 @@ ...@@ -161,7 +164,7 @@
}, },
//上拉触底 //上拉触底
onReachBottom(){ onReachBottom() {
if (this.tabactive == 1) { if (this.tabactive == 1) {
activity_select({ activity_select({
shop_id: this.shop_id, shop_id: this.shop_id,
...@@ -169,7 +172,7 @@ ...@@ -169,7 +172,7 @@
is_date: 2 is_date: 2
}).then(res => { }).then(res => {
if (res.code == 0) { if (res.code == 0) {
this.start_activity = [...this.start_activity,...res.data.data] this.start_activity = [...this.start_activity, ...res.data.data]
} }
}) })
...@@ -180,7 +183,7 @@ ...@@ -180,7 +183,7 @@
is_date: 1 is_date: 1
}).then(res => { }).then(res => {
if (res.code == 0) { if (res.code == 0) {
this.end_activity = [...this.this.end_activity,...res.data.data] this.end_activity = [...this.end_activity, ...res.data.data]
} }
}) })
} }
...@@ -215,9 +218,9 @@ ...@@ -215,9 +218,9 @@
methods: { methods: {
jumpDetail(activity_id){ jumpDetail(activity_id) {
uni.navigateTo({ uni.navigateTo({
url:`/pages/publishActivities/activityDetail/activityDetail?activity_id=${activity_id}` url: `/pages/publishActivities/activityDetail/activityDetail?activity_id=${activity_id}`
}) })
}, },
//修改活动 //修改活动
...@@ -229,12 +232,12 @@ ...@@ -229,12 +232,12 @@
}, },
// 查找产品 // 查找产品
findEleProduct(){ findEleProduct() {
}, },
switch1Change(e) { switch1Change(e) {
if(e.type=='change'){ if (e.type == 'change') {
console.log(e) console.log(e)
if (e.detail.value) { if (e.detail.value) {
activity_close({ activity_close({
...@@ -258,8 +261,8 @@ ...@@ -258,8 +261,8 @@
} }
}) })
} }
}else{ } else {
return ; return;
} }
}, },
......
pages/storeqrcode/storeqrcode.vue
View file @ fa4681d0
...@@ -164,6 +164,7 @@ ...@@ -164,6 +164,7 @@
const d = await getSharePoster({ const d = await getSharePoster({
// backgroundImage:"/static/news/sjrwm.png", // backgroundImage:"/static/news/sjrwm.png",
backgroundImage:this.statictowUrl+"static/applet5/images/uts/sjrwm.png", backgroundImage:this.statictowUrl+"static/applet5/images/uts/sjrwm.png",
//暂时使用这个 //暂时使用这个
...@@ -239,16 +240,23 @@ ...@@ -239,16 +240,23 @@
// Context.setFillStyle('black'); // Context.setFillStyle('black');
// Context.setGlobalAlpha(0.3); // Context.setGlobalAlpha(0.3);
// Context.fillRect(0, bgObj.height - bgObj.height*0.2, bgObj.width, bgObj.height*0.2); // Context.fillRect(0, bgObj.height - bgObj.height*0.2, bgObj.width, bgObj.height*0.2);
} },
}); });
console.log('海报生成成功， 临时路径: ' + d.poster.tempFilePath) console.log('海报生成成功， 临时路径: ' + d.poster.tempFilePath)
this.poster.finalPath = d.poster.tempFilePath; this.poster.finalPath = d.poster.tempFilePath;
console.log(this.poster.finalPath)
} }
this.qrShow = true; this.qrShow = true;
} catch (e) { } catch (e) {
_app.hideLoading(); _app.hideLoading();
_app.showToast(JSON.stringify(e)); _app.showToast(JSON.stringify(e));
console.log(JSON.stringify(e)); console.log(JSON.stringify(e));
console.log('海报生成成功， 临时路径: ' + d.poster.tempFilePath)
} }
}, },
saveImage() { saveImage() {
...@@ -280,6 +288,8 @@ ...@@ -280,6 +288,8 @@
} }
</script> </script>
<style lang="scss"> <style lang="scss">
.hideCanvasView { .hideCanvasView {
position: relative; position: relative;
......
utils/api/merchant.js
View file @ fa4681d0
...@@ -38,12 +38,12 @@ export function getActivityList(data){ ...@@ -38,12 +38,12 @@ export function getActivityList(data){
//判断商家类型 商品入库 //判断商家类型 商品入库
export function getskipShop(data){ export function getskipShop(data){
return request.post("/user/skipShop", data, { noAuth: true}); return request.post("user/skipShop", data, { noAuth: true});
} }
//获取分类 列表 //获取分类 列表
export function getshopclass(data){ export function getshopclass(data){
return request.post("/ele/weigh", data, { noAuth: true}); return request.post("ele/weigh", data, { noAuth: true});
} }
...@@ -52,7 +52,7 @@ export function getshopclass(data){ ...@@ -52,7 +52,7 @@ export function getshopclass(data){
*/ */
//获取分类 列表 //获取分类 列表
export function activity_nucleus(data){ export function activity_nucleus(data){
return request.post("/ele/activity_nucleus", data, { noAuth: true}); return request.post("ele/activity_nucleus", data, { noAuth: true});
} }
/** /**
...@@ -60,7 +60,7 @@ export function activity_nucleus(data){ ...@@ -60,7 +60,7 @@ export function activity_nucleus(data){
* @param {Object} data * @param {Object} data
*/ */
export function activity_add(data){ export function activity_add(data){
return request.post("/ele/activity_add", data, { noAuth: true}); return request.post("ele/activity_add", data, { noAuth: true});
} }
/** /**
...@@ -68,7 +68,7 @@ export function activity_add(data){ ...@@ -68,7 +68,7 @@ export function activity_add(data){
* @param {Object} data * @param {Object} data
*/ */
export function activity_select(data){ export function activity_select(data){
return request.post("/ele/activity_select", data, { noAuth: true}); return request.post("ele/activity_select", data, { noAuth: true});
} }
/** /**
...@@ -76,7 +76,7 @@ export function activity_select(data){ ...@@ -76,7 +76,7 @@ export function activity_select(data){
* @param {Object} data * @param {Object} data
*/ */
export function activity_close(data){ export function activity_close(data){
return request.post("/ele/activity_close", data, { noAuth: true}); return request.post("ele/activity_close", data, { noAuth: true});
} }
/** /**
...@@ -84,7 +84,7 @@ export function activity_close(data){ ...@@ -84,7 +84,7 @@ export function activity_close(data){
* @param {} data * @param {} data
*/ */
export function activity_find(data){ export function activity_find(data){
return request.post("/ele/activity_find", data, { noAuth: true}); return request.post("ele/activity_find", data, { noAuth: true});
} }
...@@ -93,7 +93,7 @@ export function activity_find(data){ ...@@ -93,7 +93,7 @@ export function activity_find(data){
* @param {} data * @param {} data
*/ */
export function activity_user(data){ export function activity_user(data){
return request.post("/ele/activity_user", data, { noAuth: true}); return request.post("ele/activity_user", data, { noAuth: true});
} }
...@@ -102,5 +102,5 @@ export function activity_user(data){ ...@@ -102,5 +102,5 @@ export function activity_user(data){
* @param {} data * @param {} data
*/ */
export function activity_update(data){ export function activity_update(data){
return request.post("/ele/activity_update", data, { noAuth: true}); return request.post("ele/activity_update", data, { noAuth: true});
} }
\ No newline at end of file
utils/debug.js
View file @ fa4681d0
...@@ -10,12 +10,8 @@ module.exports = { ...@@ -10,12 +10,8 @@ module.exports = {
// xqdebug:false,//正式权限 // xqdebug:false,//正式权限
xqdebug:true,//发布审核权限 也是测试环境的 主要用于ios xqdebug:true,//发布审核权限 也是测试环境的 主要用于ios
// #ifdef APP-PLUS
// isdebug:false,//正式 APP里面绝对是正式
// #endif
/**
* PS
*
* 正式环境 选 false !
* 本地开发环境 选 true
*
* */
} }
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