Skip to content

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

zxf

parents e7dcf492 f7354028
Show whitespace changes
Inline Side-by-side
Showing with 938 additions and 640 deletions
manifest.json
View file @ 563d4e49
...@@ -5,10 +5,11 @@ ...@@ -5,10 +5,11 @@
"description" : "商家", "description" : "商家",
"versionName" : "1.0.98", "versionName" : "1.0.98",
"versionCode" : 198, "versionCode" : 198,
"transformPx" : false, "transformPx" : false,
"compatible" : { "compatible" : {
"ignoreVersion" : true, //true表示忽略版本检查提示框，HBuilderX1.9.0及以上版本支持 "ignoreVersion" : true, //true表示忽略版本检查提示框，HBuilderX1.9.0及以上版本支持
"runtimeVersion" : "2.9.7,2.9.8", //兼容的uni-app运行环境版本号，多个版本使用,分割 "runtimeVersion" : "2.9.3,2.9.7,2.9.8", //兼容的uni-app运行环境版本号，多个版本使用,分割
"compilerVersion" : "2.9.8" //兼容的编译器版本号 "compilerVersion" : "2.9.8" //兼容的编译器版本号
}, },
/* 5+App特有相关weex */ /* 5+App特有相关weex */
......
pages/addEditEleProduct/addEditEleProduct.vue
View file @ 563d4e49
...@@ -390,44 +390,40 @@ ...@@ -390,44 +390,40 @@
checked:'2' checked:'2'
}], }],
ischeckedtime:[0],//默认选中， ischeckedtime:[0],//默认选中，
myProps: {
label: 'cate_name',
value: 'cate_id',
},
name: 'product', name: 'product',
result:[], result:[],
form: { form: {
// mandatory:'2', mandatory:'2',
// linkage_id:'', linkage_id:'',
// //cost_price 成本价 stock 商品库存purchase 进货价钱code 条形编码commission 返佣比例original_name 原始商品名 //cost_price 成本价 stock 商品库存purchase 进货价钱code 条形编码commission 返佣比例original_name 原始商品名
// specifications:'',//商品规格 specifications:'',//商品规格
// stock:'', //商品库存 stock:'', //商品库存
// cost_price:'', //进货价钱 cost_price:'', //进货价钱
// code:'' ,//条形编码 code:'' ,//条形编码
// commission:'', //返佣比例 commission:'', //返佣比例
// sell_type:0,// 售卖类型 sell_type:0,// 售卖类型
// commodity_data:{}, //原始商品名 commodity_data:{}, //原始商品名
// quality_guarantee_period:0, //保质期（月） quality_guarantee_period:0, //保质期（月）
// manufacture_date:'' , //生产日期 manufacture_date:'' , //生产日期
// manufacturer :'', ///生产厂商 manufacturer :'', ///生产厂商
// brand :'', // 品牌 brand :'', // 品牌
// checkbox: [],//断选 checkbox: [],//断选
// product_id:"",//修改的时候的产品id product_id:"",//修改的时候的产品id
// product_name:"",//产品名称 product_name:"",//产品名称
// desc:"",//产品描述 desc:"",//产品描述
// cate_id:"",//产品分类id cate_id:"",//产品分类id
// photo:"",//产品图片 photo:"",//产品图片
// lunch_box_fee:'',//餐盒费 lunch_box_fee:'',//餐盒费
// is_new:"",//是否新产品 is_new:"",//是否新产品
// is_hot:"",//是否热卖产品 is_hot:"",//是否热卖产品
// action:"add",// 方式（添加：add，修改:edit） action:"add",// 方式（添加：add，修改:edit）
// price:"",//价格 price:"",//价格
// activity_price:"",//秒杀价 activity_price:"",//秒杀价
// store_count:"" ,// 秒杀库存 store_count:"" ,// 秒杀库存
// is_seckill:"0",//0 1 是否秒杀产品 is_seckill:"0",//0 1 是否秒杀产品
// activity_id:'0',//秒杀activity_id activity_id:'0',//秒杀activity_id
// activity_list:'',//秒杀列表 activity_list:'',//秒杀列表
// limit_num:"0" //秒杀限购数量 0 不限制 limit_num:"0" //秒杀限购数量 0 不限制
}, },
timeList:[ timeList:[
{} {}
...@@ -452,13 +448,16 @@ ...@@ -452,13 +448,16 @@
activity_type:"",//判断是否可以秒杀 activity_type:"",//判断是否可以秒杀
seckilltimelist:[],//秒杀时段列表 seckilltimelist:[],//秒杀时段列表
selchildList:[], selchildList:[],
cate_name:"",
index:0, index:0,
isScanCode:true,//是不是点击了扫码 isScanCode:true,//是不是点击了扫码
codeDisabled:false,//条形码是否能输入 codeDisabled:false,//条形码是否能输入
update:true, update:true,
detail_photos:[],//详情图片 detail_photos:[],//详情图片
video_photos:[],//轮播图片 video_photos:[],//轮播图片
cate_name:"", //分类名
} }
}, },
computed: { computed: {
...@@ -765,8 +764,15 @@ ...@@ -765,8 +764,15 @@
let res = await eleProductInfo({ let res = await eleProductInfo({
product_id:this.product_id, product_id:this.product_id,
}); });
console.log(res,'法大师傅大师傅大师傅士大夫大师傅');
if(res.code==0){ if(res.code==0){
this.form.cate_id = res.data.cate_id;//分类id
for(var i = 0; i < this.chindformList.length; i++) {
if(this.chindformList[i].cate_id==res.data.cate_id){
this.cate_name=this.chindformList[i].cate_name;
break;
}
}
this.linkage_product_id = res.data.linkage_product_id this.linkage_product_id = res.data.linkage_product_id
this.bools = res.data.product_name; this.bools = res.data.product_name;
this.defaultinfo = res.data; this.defaultinfo = res.data;
...@@ -777,7 +783,7 @@ ...@@ -777,7 +783,7 @@
this.form.photo = res.data.photo;//图片 this.form.photo = res.data.photo;//图片
this.form.activity_price = res.data.activity_price //秒杀价 this.form.activity_price = res.data.activity_price //秒杀价
this.form.store_count = res.data.store_count //秒杀库存 this.form.store_count = res.data.store_count //秒杀库存
this.form.cate_id = res.data.cate_id;//分类id
this.form.activity_id = res.data.activity_id//秒杀时段id this.form.activity_id = res.data.activity_id//秒杀时段id
this.form.limit_num = res.data.limit_num this.form.limit_num = res.data.limit_num
this.form.specifications = res.data.gram this.form.specifications = res.data.gram
...@@ -837,7 +843,6 @@ ...@@ -837,7 +843,6 @@
this.classValue = ''; this.classValue = '';
} }
//属性选默认值 //属性选默认值
if(res.data.is_new==1){ if(res.data.is_new==1){
this.selchildList.push("is_new"); this.selchildList.push("is_new");
...@@ -875,16 +880,19 @@ ...@@ -875,16 +880,19 @@
} }
}, },
getForm() { getForm() {
if(this.isshowsetkilltime && (this.form.activity_price==""||this.form.store_count==""||this.form.limit_num=="") ){ // if(this.isshowsetkilltime && (this.form.activity_price==""||this.form.store_count==""||this.form.limit_num=="") ){
this.$api.msg("请填写完整秒杀数据"); // this.$api.msg("请填写完整秒杀数据");
return false; // return false;
} // }
if(!this.isInteger(this.form.limit_num) || !this.isInteger(this.form.store_count)){
this.$api.msg("秒杀库存或限购数量不能为小数"); // console.log(this.form.limit_num,this.form.store_count)
return false; // if(!this.isInteger(this.form.limit_num) || !this.isInteger(this.form.store_count)){
} // this.$api.msg("秒杀库存或限购数量不能为小数");
// return false;
// }
let can = { let can = {
action:this.product_id==''?'add':'edit',
linkage_id:this.linkage_id, linkage_id:this.linkage_id,
mandatory:this.form.mandatory, mandatory:this.form.mandatory,
gram:this.form.specifications, //商品规格 gram:this.form.specifications, //商品规格
...@@ -901,7 +909,6 @@ ...@@ -901,7 +909,6 @@
product_name:this.form.product_name,//产品名称 product_name:this.form.product_name,//产品名称
desc:this.form.desc,//产品描述 desc:this.form.desc,//产品描述
lunch_box_fee:this.form.lunch_box_fee,//餐盒费 lunch_box_fee:this.form.lunch_box_fee,//餐盒费
action:this.form.action,//方式（添加：add，修改:edit）
price:this.form.price,//价格 price:this.form.price,//价格
photo: this.c_pics.length == 0?'': this.c_pics[0].data, //图片 photo: this.c_pics.length == 0?'': this.c_pics[0].data, //图片
activity_price:this.form.activity_price,//秒杀价 activity_price:this.form.activity_price,//秒杀价
...@@ -911,6 +918,7 @@ ...@@ -911,6 +918,7 @@
limit_num:this.form.limit_num ,//秒杀限购数量 limit_num:this.form.limit_num ,//秒杀限购数量
detail_photos:this.detail_photos,//详情图 detail_photos:this.detail_photos,//详情图
video_photos:this.video_photos,//轮播图 video_photos:this.video_photos,//轮播图
cate_id:this.form.cate_id,
}; };
...@@ -940,11 +948,11 @@ ...@@ -940,11 +948,11 @@
can.is_hot = 0; can.is_hot = 0;
} }
if(this.product_id!="" && this.is_datashow !=false ){ if(this.product_id!="" && this.is_datashow !=false ){
can.action = "edit";
can.product_id = this.product_id; can.product_id = this.product_id;
} }
//添加修改外卖产品 //添加修改外卖产品
addEditEleProduct(can).then((res1)=>{ addEditEleProduct(can).then((res1)=>{
console.log(res1,'成功了');
if(res1.code==0){ if(res1.code==0){
this.$api.msg(res1.msg); this.$api.msg(res1.msg);
setTimeout(()=>{ setTimeout(()=>{
...@@ -953,6 +961,8 @@ ...@@ -953,6 +961,8 @@
}else{ }else{
this.$api.msg(res1.msg); this.$api.msg(res1.msg);
} }
}).catch(err=>{
console.log(err,'失败了');
}) })
}, },
......
pages/index/index.vue
View file @ 563d4e49
...@@ -97,7 +97,7 @@ ...@@ -97,7 +97,7 @@
<!-- <navigator url="/pages/edit/pro_manage/pro_manage"> --> <!-- <navigator url="/pages/edit/pro_manage/pro_manage"> -->
<view class="jiu_min"> <view class="jiu_min">
<view> <view>
<image class="img" src="/static/icon/20.png" mode=""></image> <image class="img" src="/static/icon/spgl.png" mode=""></image>
</view> </view>
<view>商品管理</view> <view>商品管理</view>
</view> </view>
...@@ -144,7 +144,7 @@ ...@@ -144,7 +144,7 @@
<navigator url="/pages/storeCategory/storeCategory?type=1"> <navigator url="/pages/storeCategory/storeCategory?type=1">
<view class="jiu_min"> <view class="jiu_min">
<view> <view>
<image class="img" src="/static/icon/6.png" mode=""></image> <image class="img" src="/static/icon/eleclass.png" mode=""></image>
</view> </view>
<view>商品分类</view> <view>商品分类</view>
</view> </view>
...@@ -191,7 +191,7 @@ ...@@ -191,7 +191,7 @@
<navigator url="/pages/order/shopOrder"> <navigator url="/pages/order/shopOrder">
<view class="jiu_min"> <view class="jiu_min">
<view> <view>
<image class="img" src="/static/icon/8.png" mode=""></image> <image class="img" src="/static/icon/eleguanli.png" mode=""></image>
</view> </view>
<view>订单管理</view> <view>订单管理</view>
</view> </view>
...@@ -204,7 +204,7 @@ ...@@ -204,7 +204,7 @@
<navigator url="/pages/hotelOrder/hotelOrder"> <navigator url="/pages/hotelOrder/hotelOrder">
<view class="jiu_min"> <view class="jiu_min">
<view> <view>
<image class="img" src="/static/icon/8.png" mode=""></image> <image class="img" src="/static/icon/eleguanli.png" mode=""></image>
</view> </view>
<view>订单管理</view> <view>订单管理</view>
</view> </view>
...@@ -227,7 +227,7 @@ ...@@ -227,7 +227,7 @@
<navigator url="/pages/LuckDraw/homenav/homenav"> <navigator url="/pages/LuckDraw/homenav/homenav">
<view class="jiu_min"> <view class="jiu_min">
<view> <view>
<image class="img" src="/static/news/liwuiocn.png" mode=""></image> <image class="img" src="/static/icon/liwuiocn.png" mode=""></image>
</view> </view>
<view>抽奖活动</view> <view>抽奖活动</view>
</view> </view>
...@@ -245,7 +245,7 @@ ...@@ -245,7 +245,7 @@
</navigator> </navigator>
</view> </view>
<view class="jiu_max "> <view class="jiu_max " v-if="shop_type == 'ele'">
<navigator url="/pages/Printer/AddPrinter"> <navigator url="/pages/Printer/AddPrinter">
<view class="jiu_min"> <view class="jiu_min">
<view> <view>
...@@ -256,7 +256,7 @@ ...@@ -256,7 +256,7 @@
</navigator> </navigator>
</view> </view>
<view class="jiu_max " @tap="shops"> <view class="jiu_max " @tap="shops" v-if="shop_type == 'ele'">
<view class="jiu_min"> <view class="jiu_min">
<view> <view>
<image class="img" src="/static/news/turntable.png" mode=""></image> <image class="img" src="/static/news/turntable.png" mode=""></image>
...@@ -265,7 +265,7 @@ ...@@ -265,7 +265,7 @@
</view> </view>
</view> </view>
<view class="jiu_max "> <view class="jiu_max " v-if="shop_type == 'ele'">
<navigator url="/pages/deliveryCost/deliveryCost"> <navigator url="/pages/deliveryCost/deliveryCost">
<view class="jiu_min"> <view class="jiu_min">
<view> <view>
...@@ -277,7 +277,7 @@ ...@@ -277,7 +277,7 @@
</view> </view>
<!-- hgService.showSafeSetting(); --> <!-- hgService.showSafeSetting(); -->
<view class="jiu_max " v-if="is_bld"> <view class="jiu_max " v-if="shop_type == 'ele'&&is_bld">
<navigator url="/pages/eleProduct/eleProduct?edit=1"> <navigator url="/pages/eleProduct/eleProduct?edit=1">
<view class="jiu_min"> <view class="jiu_min">
<view> <view>
...@@ -288,7 +288,7 @@ ...@@ -288,7 +288,7 @@
</navigator> </navigator>
</view> </view>
<view class="jiu_max " v-if="is_bld"> <view class="jiu_max " v-if="shop_type == 'ele'&&is_bld">
<navigator url="/pages/eleProduct/eleProduct?edit=2"> <navigator url="/pages/eleProduct/eleProduct?edit=2">
<view class="jiu_min"> <view class="jiu_min">
<view> <view>
...@@ -300,7 +300,7 @@ ...@@ -300,7 +300,7 @@
</view> </view>
<view class="jiu_max " @click="download" v-if="is_bld"> <view class="jiu_max " @click="download" v-if="shop_type == 'ele'&&is_bld">
<view> <view>
<view class="jiu_min"> <view class="jiu_min">
<view> <view>
...@@ -313,11 +313,11 @@ ...@@ -313,11 +313,11 @@
<!-- url="/pages/publishActivities/activityList/activityList" --> <!-- url="/pages/publishActivities/activityList/activityList" -->
<view class="jiu_max "> <view class="jiu_max " v-if="shop_type == 'ele'">
<navigator url="/pages/publishActivities/activityList/activityList"> <navigator url="/pages/publishActivities/activityList/activityList">
<view class="jiu_min"> <view class="jiu_min">
<view> <view>
<image class="img" src="https://luma.jxdsy.cn/static/applet5/images/download.png" mode=""></image> <image class="img" src="/static/icon/0yuan.png" mode=""></image>
</view> </view>
<view>0元领活动</view> <view>0元领活动</view>
</view> </view>
...@@ -564,7 +564,7 @@ ...@@ -564,7 +564,7 @@
this.is_luck_draw = res.data.shop_info.is_luck_draw this.is_luck_draw = res.data.shop_info.is_luck_draw
this.money_type = res.data.shop_info.money_type this.money_type = res.data.shop_info.money_type
this.activity_type = res.data.shop_info.activity_type //判断是否有秒杀资格 this.activity_type = res.data.shop_info.activity_type //判断是否有秒杀资格
console.log(this.shop_type,'aa')
} else { } else {
this.$api.msg(res.msg); this.$api.msg(res.msg);
} }
......
pages/order/shoporderdetail/shoporderdetail.vue
View file @ 563d4e49
...@@ -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 @ 563d4e49
<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="" style="text-align: center;height: 120upx;line-height: 120upx;font-weight: bold;font-size: 32upx;">
已有 <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: 20upx;"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 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> </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="height: 100upx;padding: 0 24upx;background-color: rgb(255, 255, 255);margin-bottom: 20upx;"
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 +79,8 @@ ...@@ -20,10 +79,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 +90,12 @@ ...@@ -33,11 +90,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,80 +104,262 @@ ...@@ -46,80 +104,262 @@
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, //核销人员分页数
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('触底加载'); // 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
uni.stopPullDownRefresh(); this.receivePeopleNumber = res.data.receivePeopleNumber;
}else{ // this.unreceivePeopleNumber = res.data.unreceivePeopleNumber;
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.receivePeopleNumber = 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
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.receivePeopleNumber = 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 @ 563d4e49
...@@ -23,7 +23,9 @@ ...@@ -23,7 +23,9 @@
</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:44upx ;">{{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>
...@@ -49,7 +51,7 @@ ...@@ -49,7 +51,7 @@
</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>
...@@ -86,7 +88,7 @@ ...@@ -86,7 +88,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>
......
static/icon/20.png
View replaced file @ e7dcf492 View file @ 563d4e49
static/icon/20.png

4.24 KB | W: | H:

static/icon/20.png

1.81 KB | W: | H:

static/icon/20.png
static/icon/20.png
static/icon/20.png
static/icon/20.png
  • 2-up
  • Swipe
  • Onion skin
utils/debug.js
View file @ 563d4e49
...@@ -4,25 +4,14 @@ module.exports = { ...@@ -4,25 +4,14 @@ module.exports = {
//是否为开发调试环境 true为本地环境 false 为正式环境 //是否为开发调试环境 true为本地环境 false 为正式环境
isdebug:false,//正式 isdebug:false,//正式
// isdebug:true,//测试 // isdebug:true,//测试
// xqdebug:false,//正式权限
xqdebug:true,//发布审核权限 也是测试环境的 主要用于ios
xqdebug:false,//正式权限
// xqdebug:true,//发布审核权限 也是测试环境的 主要用于ios
// #ifdef APP-PLUS // #ifdef APP-PLUS
// isdebug:false,//正式 APP里面绝对是正式 // isdebug:false,//正式 APP里面绝对是正式
// #endif // #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