root
/
school-peisong
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

1

master
tianyi 2 days ago
parent
4bea82f067
commit
7b1a281e5b
4 changed files with 76 additions and 57 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      pages/index/index.vue
  2. 6
      pages/login/login.vue
  3. 29
      pages/myCenter/shopDetail.vue
  4. 4
      pages/shop/shopReturnOrder.vue

8
pages/index/index.vue
View File

@ -225,7 +225,6 @@
}, },
onShow() { onShow() {
this.indexInit() this.indexInit()
this.getData()
}, },
onLoad() { onLoad() {
@ -238,6 +237,7 @@
that.width = info.screenWidth * 2; that.width = info.screenWidth * 2;
} }
}); });
this.getData()
this.getBusinessStatus() this.getBusinessStatus()
if(!uni.getStorageSync('area')){ if(!uni.getStorageSync('area')){
this.checkArea() this.checkArea()
@ -264,7 +264,8 @@
}, false, 'GET', 'application/x-www-form-urlencoded').then((res) => { }, false, 'GET', 'application/x-www-form-urlencoded').then((res) => {
if (res.code == 200) { if (res.code == 200) {
this.shop = res.result this.shop = res.result
this.shop.shopIcon = uni.getStorageSync('shopIcon') this.shop.shopIcon = JSON.parse(uni.getStorageSync('area')).shop.shopIcon
this.shop.shopName = JSON.parse(uni.getStorageSync('area')).shop.shopName
this.businessStatus = res.result.status this.businessStatus = res.result.status
} else { } else {
uni.showToast({ uni.showToast({
@ -276,7 +277,10 @@
}).catch((res) => {}) }).catch((res) => {})
}, },
onClickArea(item){ onClickArea(item){
console.log('好的好的',item)
uni.setStorageSync('area',JSON.stringify(item)) uni.setStorageSync('area',JSON.stringify(item))
this.getBusinessStatus()
this.getData()
// this.searchForm.regionId = item.id // this.searchForm.regionId = item.id
// this.getDelivery(); // this.getDelivery();
// this.getShopArea(); // this.getShopArea();

6
pages/login/login.vue
View File

@ -36,9 +36,9 @@
</view> </view>
</block> </block>
<view class="small-btn"> <view class="small-btn">
<!-- <view class="reg-btn" @click="loginType = !loginType"> <view class="reg-btn" @click="loginType = !loginType">
切换登录方式 切换登录方式
</view> --> </view>
<!-- <navigator v-if="loginType == false" class="forget-pass" url="/pages/login/regist?type=3"> <!-- <navigator v-if="loginType == false" class="forget-pass" url="/pages/login/regist?type=3">
{{i18n.login.forgetPass}} {{i18n.login.forgetPass}}
</navigator> --> </navigator> -->
@ -75,7 +75,7 @@
wayValue:0, wayValue:0,
captchaImg:'', captchaImg:'',
top: 0, top: 0,
loginType: true, loginType: false,
codetimes: '获取验证码', codetimes: '获取验证码',
timer: null, timer: null,
canshowcode: false, canshowcode: false,

29
pages/myCenter/shopDetail.vue
View File

@ -6,7 +6,8 @@
门头图 门头图
</view> </view>
<view class="list-right" @tap="pictureAdd('mentou')"> <view class="list-right" @tap="pictureAdd('mentou')">
<view class="upload-img" v-if="shop.shopIcon ==''" style="background: #eee;text-align: center;line-height: 100rpx;"> <view class="upload-img" v-if="shop.shopIcon ==''"
style="background: #eee;text-align: center;line-height: 100rpx;">
<uni-icons type="camera" size="28" color="#777"></uni-icons> <uni-icons type="camera" size="28" color="#777"></uni-icons>
</view> </view>
<image :src="shop.shopIcon" v-if="shop.shopIcon !=''" mode="" class="upload-img"></image> <image :src="shop.shopIcon" v-if="shop.shopIcon !=''" mode="" class="upload-img"></image>
@ -25,7 +26,8 @@
副标题 副标题
</view> </view>
<view class="list-right"> <view class="list-right">
<input type="text" placeholder="请输入副标题" v-model="shop.subtitle" style="height: 100rpx;line-height: 100rpx;" /> <input type="text" placeholder="请输入副标题" v-model="shop.subtitle"
style="height: 100rpx;line-height: 100rpx;" />
</view> </view>
</view> </view>
<view class="list-1"> <view class="list-1">
@ -73,7 +75,8 @@
支付宝账号 支付宝账号
</view> </view>
<view class="list-right"> <view class="list-right">
<input type="text" placeholder="请输入支付宝账号" v-model="shop.aliAccount" style="height: 100rpx;line-height: 100rpx;" /> <input type="text" placeholder="请输入支付宝账号" v-model="shop.aliAccount"
style="height: 100rpx;line-height: 100rpx;" />
</view> </view>
</view> </view>
<view class="list-1"> <view class="list-1">
@ -81,7 +84,8 @@
支付宝实名 支付宝实名
</view> </view>
<view class="list-right"> <view class="list-right">
<input type="text" placeholder="请输入支付宝账号" v-model="shop.aliName" style="height: 100rpx;line-height: 100rpx;" /> <input type="text" placeholder="请输入支付宝账号" v-model="shop.aliName"
style="height: 100rpx;line-height: 100rpx;" />
</view> </view>
</view> </view>
</view> </view>
@ -103,7 +107,8 @@
} }
}, },
onLoad() { onLoad() {
this.shop = JSON.parse(uni.getStorageSync('shop')); this.shop = JSON.parse(uni.getStorageSync('area')).shop;
console.log('好的好的',this.shop)
this.shopImages = this.shop.shopImages.split('@@') this.shopImages = this.shop.shopImages.split('@@')
this.huanjing = JSON.parse(this.shopImages[3])[0] this.huanjing = JSON.parse(this.shopImages[3])[0]
@ -178,7 +183,8 @@
submit() { submit() {
console.log(this.shop) console.log(this.shop)
console.log(typeof(this.shop)) console.log(typeof(this.shop))
this.NB.sendRequest('/app/shop/edit', this.shop, false, 'PUT', 'application/x-www-form-urlencoded').then(res => { this.NB.sendRequest('/app/shop/edit', this.shop, false, 'PUT', 'application/x-www-form-urlencoded').then(
res => {
if (res.code == 200) { if (res.code == 200) {
uni.showModal({ uni.showModal({
@ -202,12 +208,14 @@
</script> </script>
<style> <style>
page,.page1{ page,
.page1 {
width: 100%; width: 100%;
height: 100%; height: 100%;
font-size: 28rpx; font-size: 28rpx;
background: #eee; background: #eee;
} }
.list-box { .list-box {
width: 100%; width: 100%;
height: auto; height: auto;
@ -215,6 +223,7 @@
margin-top: 20rpx; margin-top: 20rpx;
} }
.list-1 { .list-1 {
display: flex; display: flex;
width: 100%; width: 100%;
@ -223,6 +232,7 @@
border-bottom: 1px solid #eee; border-bottom: 1px solid #eee;
} }
.list-2 { .list-2 {
width: 100%; width: 100%;
height: 100rpx; height: 100rpx;
@ -230,15 +240,18 @@
text-align: center; text-align: center;
border-bottom: 1px solid #eee; border-bottom: 1px solid #eee;
} }
.list-icon { .list-icon {
width: 100rpx; width: 100rpx;
height: 100rpx; height: 100rpx;
text-align: center; text-align: center;
} }
.list-name { .list-name {
flex: 1; flex: 1;
padding-left: 20rpx; padding-left: 20rpx;
} }
.list-right { .list-right {
flex: 1; flex: 1;
height: 100rpx; height: 100rpx;
@ -246,12 +259,14 @@
padding-right: 20rpx; padding-right: 20rpx;
overflow: hidden; overflow: hidden;
} }
.upload-img { .upload-img {
width: 60rpx; width: 60rpx;
height: 60rpx; height: 60rpx;
background-size: 100%; background-size: 100%;
margin-top: 20rpx; margin-top: 20rpx;
} }
.list-2 { .list-2 {
width: 100%; width: 100%;
height: 100rpx; height: 100rpx;

4
pages/shop/shopReturnOrder.vue
View File

@ -314,7 +314,7 @@
}else{ }else{
this.searchCountForm.linkId = uni.getStorageSync('shopId') this.searchCountForm.linkId = uni.getStorageSync('shopId')
} }
this.NB.sendRequest("/mall/refund/page", {}, false, 'POST', 'application/json').then((res) => { this.NB.sendRequest("/mall/refund/page", this.searchCountForm, false, 'POST', 'application/json').then((res) => {
if (res.code == 200) { if (res.code == 200) {
that.returnCount = res.result.records.length; that.returnCount = res.result.records.length;
that.returnData = res.result.records that.returnData = res.result.records
@ -389,7 +389,7 @@
this.returnFormData.refundTypeStatus = item.refundTypeStatus; this.returnFormData.refundTypeStatus = item.refundTypeStatus;
let that = this let that = this
this.NB.sendRequest("/mall/refund/allowOrReject", {}, false, 'POST', 'application/json').then((res) => { this.NB.sendRequest("/mall/refund/allowOrReject", this.returnFormData, false, 'POST', 'application/json').then((res) => {
if (res.code == 200) { if (res.code == 200) {
uni.showToast({ uni.showToast({
title: res.message, title: res.message,

Write Preview
Loading…
Cancel
Save