diff --git a/.env b/.env index e59c517..f7daf1a 100644 --- a/.env +++ b/.env @@ -3,11 +3,19 @@ SHOPRO_VERSION = v1.8.3 # 后端接口 - 正式环境（通过 process.env.NODE_ENV 非 development） SHOPRO_BASE_URL = https://zysc.fjptzykj.com -#SHOPRO_BASE_URL = http://192.168.1.20:6127 +#SHOPRO_BASE_URL = http://192.168.1.12:6127 +#SHOPRO_BASE_URL = http://124.222.208.27:6127 +#SHOPRO_BASE_URL = http://192.168.1.9:6127 +#SHOPRO_BASE_URL = http://192.168.1.8:6127 +#SHOPRO_BASE_URL = http://192.168.1.7:6127 # 后端接口 - 测试环境（通过 process.env.NODE_ENV = development） SHOPRO_DEV_BASE_URL = https://zysc.fjptzykj.com -#SHOPRO_DEV_BASE_URL = http://192.168.1.20:6127 +#SHOPRO_DEV_BASE_URL = http://192.168.1.12:6127 +#SHOPRO_DEV_BASE_URL = http://124.222.208.27:6127 +#SHOPRO_DEV_BASE_URL = http://192.168.1.9:6127 +#SHOPRO_DEV_BASE_URL = http://192.168.1.8:6127 +#SHOPRO_DEV_BASE_URL = http://192.168.1.7:6127 # 后端接口前缀（一般不建议调整） SHOPRO_API_PATH = /app-api diff --git a/pages/coupon/list.vue b/pages/coupon/list.vue index eb1ed09..3080bb6 100644 --- a/pages/coupon/list.vue +++ b/pages/coupon/list.vue @@ -48,7 +48,7 @@ class="ss-reset-button card-btn ss-flex ss-row-center ss-col-center" :class="item.status !== 1 ? 'disabled-btn' : ''" :disabled="item.status !== 1" - @click.stop="sheep.$router.go('/pages/index/category', { couponId: item.id })" + @click.stop="sheep.$router.go('/pages/goods/list')" > {{ item.status === 1 ? '立即使用' : item.status === 2 ? '已使用' : '已过期' }} diff --git a/pages/subscribe/subscribe.vue b/pages/subscribe/subscribe.vue index 68336e3..afa9732 100644 --- a/pages/subscribe/subscribe.vue +++ b/pages/subscribe/subscribe.vue @@ -1,41 +1,11 @@ @@ -338,28 +205,16 @@ showShareModal, showAuthModal } from '@/sheep/hooks/useModal'; - // import pickerTime from "@/pages/commission/pickerTime.vue" // 用户信息 export default { - // components: { - // pickerTime - // }, data() { return { isLogin: null, memberId: null, - // showTime: false, serviceTime: [], sjd: {}, ym: [], - // starhour: 8, - // starminute: 0, - // endhour: 18, - // endminute: 0, - // timejg: 70, - hsstr: "", - dateList: [], typeList: [{ dictValue: 0, @@ -373,27 +228,33 @@ typenameList: [], addDate: "", techList: [], // 技师列表 - //医馆信息 - selectedClinicIndex: 0, // 当前选中的医馆索引 - brandList: [{ - name: "" - }], - brandNameList: [], - brandId: "", + selectedClinicIndex: 0, // 当前选中的门店索引 + selectedClinicIndex2: 0, // 当前选中的项目索引 + selectedClinicIndex3: 0, // 当前选中的项目索引 + brandList: [], //门店列表数据 + brandList2: [], //项目列表数据 + brandList3: [], //套餐列表数据 + brandNameList: [],//门店列表 + brandNameList2: [],//项目列表 + brandNameList3: [],//套餐列表 + brandId: "",//门店当前选中id brandName: "", selectedDayIndex: 0, selecttypeIndex: 0, techid: 0, type: 0, ll: '请选择', + ll2: '请选择', + ll3: '请选择', gg: '请选择' }; }, created() { this.isLogin = computed(() => sheep.$store('user').isLogin); this.memberId = computed(() => sheep.$store('user').userInfo).value.id - this.brandlists(); - + this.brandlists();//调用门店列表 + // this.brandlists2();//调用项目列表 + // this.brandlists3();//调用套餐列表 this.generateDateList(); this.addDate = this.dateList[0].addDate; this.gettypeList(); @@ -404,11 +265,20 @@ onClinicChange(event) { const selectedClinicIndex = event.detail.value; this.selectedClinicIndex = selectedClinicIndex; - this.brandName = this.brandList.list[selectedClinicIndex].name - this.brandId = this.brandList.list[selectedClinicIndex].id - console.log("dddddddddddd") - this.ll = this.brandList.list[selectedClinicIndex].name - this.technicianList(); + this.ll = this.brandList[selectedClinicIndex].name + // console.log("dddddddddddd") + // this.ll = this.brandList.list[selectedClinicIndex].name + this.brandId = this.brandList[selectedClinicIndex].id + this.brandlists2(); + }, + onClinicChange2(event) { + const selectedClinicIndex = event.detail.value; + this.selectedClinicIndex2 = selectedClinicIndex; + this.ll2 = this.brandList2[selectedClinicIndex].name + // this.brandId = this.brandList.list[selectedClinicIndex].id + console.log("------onClinicChange2------") + // this.ll = this.brandList.list[selectedClinicIndex].name + // this.technicianList(); }, ontype(event) { const selecttypeIndex = event.detail.value; @@ -419,43 +289,55 @@ this.gg = this.typeList[selecttypeIndex].label this.technicianList(); }, - // 查询医馆列表 + // 查询门店列表 brandlists() { request({ - url: `${baseUrl}${apiPath}/h5/brand/list`, + url: `${baseUrl}${apiPath}/h5/brand/getBrand`, method: 'GET', custom: { showLoading: false, }, }).then((res) => { this.brandList = res.data - console.log(this.brandList, "this.brandList") - for (var i = 0; i < this.brandList.list.length; i++) { - // this.brandList[i].depict=(this.brandList[i].depict).replace(/\ { + // this.brandList2 = res.data + console.log(res,"------brandList2------") + // for (var i = 0; i < this.brandList2.length; i++) { + // this.brandNameList2.push(this.brandList2[i].name) + // } + }); + }, + // 查询套餐列表 + brandlists3() { + request({ + url: `${baseUrl}${apiPath}/h5/technician/getTecchnician`, + method: 'GET', + custom: { + showLoading: false, + }, + }).then((res) => { + this.brandList3 = res.data + for (var i = 0; i < this.brandList3.length; i++) { + this.brandNameList3.push(this.brandList3[i].name) } - - this.brandId = this.brandList[0].id - this.technicianList(); }); - // uni.request({ - // url: `${baseUrl}/api/h5/brand/list`, - // success: (res) => { - // this.brandList = res.data - // for (var i = 0; i < this.brandList.length; i++) { - // // this.brandList[i].depict=(this.brandList[i].depict).replace(/\ { - // console.log(error) - // } - // }) }, - gettypeList() { request({ url: `${baseUrl}${apiPath}/h5/reservation/type`, @@ -466,28 +348,11 @@ }).then((res) => { console.log(res, "typeListtypeList") this.typeList = res.data - // this.typeList.depict=this.typeList.depict.replace(/\ { - // this.typeList = res.data.data - // // this.typeList.depict=this.typeList.depict.replace(/\ { - // console.log(error) - // } - // }) - - }, // 查询医生列表 technicianList() { @@ -500,7 +365,6 @@ method: 'GET', params: { type: this.type, - // addDate:this.addDate, brandId: this.brandId }, custom: { @@ -520,33 +384,6 @@ console.log(this.techList) }); - // uni.request({ - // // url: 'https://sfyjk.com/api/h5/technician/list', - // url: `${baseUrl}/app-api/h5/technician/list`, - // data: { - // type: this.type, - // // addDate:this.addDate, - // brandId: this.brandId - // }, - // success: (res) => { - // console.log(res) - // this.techList = res.data.rows - // console.log(this.techList) - // if (this.techList.length > 0) { - // this.techid = this.techList[0].id - // var item = { - // id: this.techid - // } - // this.onradio(item); - // } - - // console.log(this.techList) - - // }, - // fail: (error) => { - // console.log(error) - // } - // }) }, onradio(item) { @@ -940,7 +777,7 @@ align-items: center; &:hover { - background-color: #ff5541; + // background-color: #ff5541; } .date { diff --git a/pages/user/wallet/score.vue b/pages/user/wallet/score.vue index 1c8c50d..52a47be 100644 --- a/pages/user/wallet/score.vue +++ b/pages/user/wallet/score.vue @@ -1,282 +1,441 @@ + .l { + &>view { + color: white; + text-align: center; + } + + .b { + margin-bottom: 7px; + font-size: 40rpx; + font-weight: 700; + } + + .c { + font-size: 25rpx; + font-weight: 700; + } + } + } + + .score-box { + height: 100%; + + .all-num { + font-size: 50rpx; + font-weight: bold; + color: #fff; + font-family: OPPOSANS; + } + + .all-title { + font-size: 26rpx; + font-weight: 500; + color: #fff; + } + + .cicon-help-o { + color: #fff; + font-size: 28rpx; + } + } + } + + // 筛选 + .filter-box { + height: 114rpx; + background-color: $bg-page; + background: rgb(193, 145, 81); + + .total-box { + font-size: 24rpx; + font-weight: 500; + color: $dark-9; + } + + .date-btn { + background-color: $white; + line-height: 54rpx; + border-radius: 27rpx; + padding: 0 20rpx; + font-size: 24rpx; + font-weight: 500; + color: $dark-6; + + .ss-seldate-icon { + font-size: 50rpx; + color: $dark-9; + } + } + } + + .list-box { + .list-item { + background: #fff; + border-bottom: 1rpx solid #dfdfdf; + padding: 30rpx; + + .name { + font-size: 28rpx; + + font-weight: 500; + color: rgba(102, 102, 102, 1); + line-height: 28rpx; + margin-bottom: 20rpx; + } + + .time { + font-size: 24rpx; + + font-weight: 500; + color: rgba(196, 196, 196, 1); + line-height: 24px; + } + + .add { + font-size: 30rpx; + + font-weight: 500; + color: #e6b873; + } + + .minus { + font-size: 30rpx; + + font-weight: 500; + color: $dark-3; + } + } + } + \ No newline at end of file