Skip to content

L
lumastoreapp
Commit 1e12f3c3 authored by xieyishang's avatar xieyishang
Browse files
Options

sss~

parent cfd4a4c9
Show whitespace changes
Inline Side-by-side
Showing with 80 additions and 42 deletions
manifest.json
View file @ 1e12f3c3
...@@ -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.41", "versionName" : "1.0.46",
"versionCode" : 141, "versionCode" : 146,
"transformPx" : false, "transformPx" : false,
/* 5+App特有相关 */ /* 5+App特有相关 */
"app-plus" : { "app-plus" : {
......
pages.json
View file @ 1e12f3c3
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
{ {
"path" : "pages/setPassword/setPassword", "path" : "pages/setPassword/setPassword",
"style" : { "style" : {
"navigationBarTitleText":"修改密码" "navigationBarTitleText":"修改登录密码"
} }
}, },
......
pages/CardSend/CardSend.scss
View file @ 1e12f3c3
...@@ -150,6 +150,7 @@ ...@@ -150,6 +150,7 @@
.submitbtns{ .submitbtns{
margin: 0 24upx; margin: 0 24upx;
margin-top: 60upx; margin-top: 60upx;
margin-bottom: 60upx;
height:88upx; height:88upx;
line-height: 88upx; line-height: 88upx;
text-align: center; text-align: center;
......
pages/CardSend/CardSend.vue
View file @ 1e12f3c3
...@@ -296,9 +296,6 @@ ...@@ -296,9 +296,6 @@
//获取商品列表 //获取商品列表
this.shop_goodsFun(); this.shop_goodsFun();
var d = new Date();
// this.defaultVal = [(d.getFullYear()).toString(),(d.getMonth()+1).toString()]
this.defaultVal = [(d.getFullYear()).toString(),(d.getMonth()+1).toString(),'01','-',(d.getFullYear()).toString(),(d.getMonth()+1).toString(),'01'];
}, },
//滚动到最底部 //滚动到最底部
...@@ -345,7 +342,16 @@ ...@@ -345,7 +342,16 @@
if(res.code==0){ if(res.code==0){
let list = res.data; let list = res.data;
list.map((item,index)=>{ list.map((item,index)=>{
if(item.goods_id){
item.product_id = item.goods_id.toString();
}else if(item.room_id){
item.product_id = item.room_id.toString();
item.product_name = item.title;
}else if(item.product_id){
item.product_id = item.product_id.toString(); item.product_id = item.product_id.toString();
}
item.checked = false; item.checked = false;
return item; return item;
}) })
...@@ -398,13 +404,13 @@ ...@@ -398,13 +404,13 @@
async switch_couponsFun(item,valse,index){ async switch_couponsFun(item,valse,index){
let res = await closedCoupons({ let res = await closedCoupons({
id:item.id, id:item.id,
status:item.status==0?2:0,//开启（0），关闭 2 status:item.status==0?2:0,//开启（0），关闭 2 //valse,//valse,//
}); });
if(res.code==0){ if(res.code==0){
this.$api.msg(res.msg); this.$api.msg(res.msg);
console.log("status",this.cardlist[index].status); console.log("status",this.cardlist,index);
this.cardlist[index].status = res.data.status; this.cardlist[index].status = item.status==0?2:0;
console.log("status",this.cardlist[index].status); console.log("status",this.cardlist[index].status);
}else{ }else{
...@@ -436,14 +442,20 @@ ...@@ -436,14 +442,20 @@
} }
// let iddata = []; // let iddata = [];
this.shoplist = this.shoplist.map((item,index)=>{//参与的商品默认选中的 this.shoplist = this.shoplist.map((item1,index)=>{//参与的商品默认选中的
console.info(res.data.goods_ids.indexOf(item.product_id),"1242"); console.info(item1.product_id,"000");
if(res.data.goods_ids.indexOf(Number(item.product_id))!=-1){ // if(){
item.checked = true;
// }
console.info(Number(item1.product_id),JSON.stringify(res.data.goods_ids),"item1.product_id");
if(res.data.goods_ids.indexOf(item1.product_id)!=-1){
item1.checked = true;
}else{ }else{
item.checked = false; item1.checked = false;
} }
return item return item1
}) })
parameter.goods_id = res.data.goods_ids; parameter.goods_id = res.data.goods_ids;
...@@ -491,6 +503,17 @@ ...@@ -491,6 +503,17 @@
console.log(e); console.log(e);
this.parameter.goods_id = e.detail.value; this.parameter.goods_id = e.detail.value;
this.shoplist = this.shoplist.map((item1,index)=>{//参与的商品默认选中的
if(this.parameter.goods_id.indexOf(item1.product_id)!=-1){
item1.checked = true;
}else{
item1.checked = false;
}
return item1
})
}, },
//弹窗里面的方法 //弹窗里面的方法
togglePopup(type, open) { togglePopup(type, open) {
......
pages/edit/shop/shop.vue
View file @ 1e12f3c3
...@@ -102,7 +102,7 @@ ...@@ -102,7 +102,7 @@
addr:"",//地址 addr:"",//地址
business_time:"",//时间 business_time:"",//时间
logo:"",//店铺logo logo:"",//店铺logo
closed:1,//是否营业（0是，1否）
// city_code: "",//城市代码 // city_code: "",//城市代码
// area_code: "",//区号 // area_code: "",//区号
}, },
...@@ -167,9 +167,7 @@ ...@@ -167,9 +167,7 @@
this.fromdata.addr = this.shopinfos.addr; this.fromdata.addr = this.shopinfos.addr;
this.fromdata.business_time = this.shopinfos.business_time;//营业时间 需要特殊处理 this.fromdata.business_time = this.shopinfos.business_time;//营业时间 需要特殊处理
this.fromdata.logo = this.shopinfos.logo; this.fromdata.logo = this.shopinfos.logo;
this.fromdata.closed = this.shopinfos.closed;//开关 需要特殊处理
this.switchA = this.shopinfos.closed==0?true:false;//开关状态
//console.info(this.fromdata.business_time.split("---"),"business_time"); //console.info(this.fromdata.business_time.split("---"),"business_time");
...@@ -193,17 +191,6 @@ ...@@ -193,17 +191,6 @@
} }
} }
// contact :"",//联系人
// tel:"",//电话
// lat:"",///经纬度
// lng:"",//经纬度
// details:"",//介绍
// addr:"",//地址
// business_time:"",//时间
// logo:"",//店铺logo
// closed:1,//是否营业（0是，1否）
}else{ }else{
this.$api.msg(res.msg); this.$api.msg(res.msg);
} }
...@@ -257,12 +244,7 @@ ...@@ -257,12 +244,7 @@
}, },
SwitchAchange(e){ SwitchAchange(e){
console.info(e.detail.value);
if(e.detail.value){
this.fromdata.closed=0;//营业
}else{
this.fromdata.closed=1;//打烊
}
}, },
TimeChange(e) { TimeChange(e) {
this.time = e.detail.value this.time = e.detail.value
......
pages/setPassword/setPassword.vue
View file @ 1e12f3c3
...@@ -53,8 +53,22 @@ ...@@ -53,8 +53,22 @@
//账户密码登录的 //账户密码登录的
username:"18979561614", username:"18979561614",
password:"123456", password:"123456",
is_pay:false,//是否支付（默认false） (false:登录密码，true:支付密码)
}; };
}, },
onLoad(opdata) {
if(opdata.is_pay==0){
this.is_pay = false;
uni.setNavigationBarTitle({
title:"修改登录密码"
})
}else if(opdata.is_pay==1){
this.is_pay = true;
uni.setNavigationBarTitle({
title:"修改支付密码"
})
}
},
computed:{ computed:{
userInfo(){ userInfo(){
return this.$store.state.userInfo; return this.$store.state.userInfo;
...@@ -75,12 +89,26 @@ ...@@ -75,12 +89,26 @@
verifyPass:this.verifyPass,//确认密码 verifyPass:this.verifyPass,//确认密码
lodPass:this.lodPass,//旧密码 lodPass:this.lodPass,//旧密码
// code:this.code,//验证码 // code:this.code,//验证码
is_pay:this.is_pay,
}); });
if(res.code==0){ if(res.code==0){
this.$api.msg("修改成功~"); this.$api.msg("修改成功~");
if(this.is_pay){
//修改支付
setTimeout(()=>{
uni.navigateBack({
})
},1500)
}else{
//修改登录
setTimeout(()=>{
uni.redirectTo({ uni.redirectTo({
url:"/pages/login/login" url:"/pages/login/login"
}) })
},1500)
}
}else{ }else{
this.$api.msg(res.msg); this.$api.msg(res.msg);
......
pages/setup/setup.vue
View file @ 1e12f3c3
...@@ -41,8 +41,12 @@ ...@@ -41,8 +41,12 @@
<text class="cell-tit">关闭店铺</text> <text class="cell-tit">关闭店铺</text>
<image class="jiantousi" src="/static/news/jiantousi.png" mode=""></image> <image class="jiantousi" src="/static/news/jiantousi.png" mode=""></image>
</view> </view>
<navigator url="/pages/setPassword/setPassword" class="list-cell b-b" hover-class="cell-hover" :hover-stay-time="50"> <navigator url="/pages/setPassword/setPassword?is_pay=0" class="list-cell b-b" hover-class="cell-hover" :hover-stay-time="50">
<text class="cell-tit">修改密码</text> <text class="cell-tit">修改登录密码</text>
<image class="jiantousi" src="/static/news/jiantousi.png" mode=""></image>
</navigator>
<navigator url="/pages/setPassword/setPassword?is_pay=1" class="list-cell b-b" hover-class="cell-hover" :hover-stay-time="50">
<text class="cell-tit">修改支付密码</text>
<image class="jiantousi" src="/static/news/jiantousi.png" mode=""></image> <image class="jiantousi" src="/static/news/jiantousi.png" mode=""></image>
</navigator> </navigator>
<navigator url="/pages/about/about" class="list-cell b-b" hover-class="cell-hover" :hover-stay-time="50"> <navigator url="/pages/about/about" class="list-cell b-b" hover-class="cell-hover" :hover-stay-time="50">
......
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