weipengfei
/
purchase-let
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: weipengfei:76daf934b1474e98ff72cf522f103e890055f5b6
Branches Tags
weipengfei:master
weipengfei:dev
weipengfei:product
weipengfei:release
..
compare: weipengfei:3bf955d804ed5d024807c68cd818039ef3d6630a
Branches Tags
weipengfei:dev
weipengfei:product
weipengfei:master
weipengfei:release

No commits in common. "76daf934b1474e98ff72cf522f103e890055f5b6" and "3bf955d804ed5d024807c68cd818039ef3d6630a" have entirely different histories.
76daf934b1 ... 3bf955d804

10 changed files with 958 additions and 1083 deletions
Show Stats Expand all files Collapse all files

4
api/order.js
View File

@ -75,7 +75,3 @@ export const refundReasonListApi = (data) => {
export const applyRefundApi = (data) => {
return request.post('/order/order/apply_refund', data);
}
export const UserProductStorageLogApi = (data) => {
return request.get('/user_product_storage_log/UserProductStorageLog/lists', data);
}

24
components/goodPopup.vue
View File

@ -63,7 +63,14 @@
computed,
nextTick,
ref,
} from "vue"
import {
toast
} from "../uni_modules/uview-plus";
import {
onShow
} from '@dcloudio/uni-app';
const foucs1 = ref(null)
const props = defineProps({
@ -71,17 +78,20 @@
type: Boolean,
default: false
},
priceKey: {
type: Object,
default: () => ({})
}
})
const valChange = () => {
uni.vibrateShort();
}
let priceKey = ref({})
if (uni.getStorageSync('PRICE_KEY')) {
priceKey.value = JSON.parse(uni.getStorageSync('PRICE_KEY'));
} else {
priceKey.value = {};
}
const datas = ref({
cart_num: ''
});
@ -111,9 +121,7 @@
const subtotal = computed(() => {
let num = +datas.value.cart_num || 1;
let sell = +datas.value[props.priceKey.off_activity == 1 ? props.priceKey.price : props
.priceKey
.op_price];
let sell = +datas.value[priceKey.value.off_activity == 1 ? priceKey.value.price : priceKey.value.op_price];
return Number(num * sell * 100 / 100).toFixed(2)
})

6
pageQuota/asset/index.vue
View File

@ -1,5 +1,4 @@
<template>
<block v-if="lists.length">
<view class="m-card m-good" v-for="(item, index) in lists" :key="index">
<view class="shop-check" @click="item.check=!item.check">
<image v-if="!item.check" src="@/static/icon/n-check.png"></image>
@ -23,11 +22,6 @@
</view>
</view>
</view>
</block>
<up-empty v-else mode="history" style="margin-top: 20vh;" text='没有更多内容了'>
</up-empty>
<view style="height: 200rpx;" />
<view class="bottom">

137
pageQuota/asset/lists.vue
View File

@ -1,137 +0,0 @@
<template>
<up-sticky bgColor="#fff" style="padding: 20rpx;">
<up-tabs :list="tabsLst" :itemStyle="{ width: '50vw', paddingBottom: '20rpx' }" lineColor='#50C758'
:current='currentTab' @change="tabsChange"></up-tabs>
</up-sticky>
<view class="content" v-if="lists.length">
<view class="card" v-for="(item,index) in lists" :key="item.id">
<view class="head">
<view class="">
{{item.system_store_name}}
</view>
<view v-if="currentTab==0" style="text-decoration: underline;text-underline-offset: 5rpx;"
@click="hdClick(item)">
提货码
</view>
</view>
<view class="card-li" v-if="currentTab==0">
<text class="lab">预约时间：</text>{{item.times}}
</view>
<view class="card-li" v-if="currentTab==1">
<text class="lab">提货时间：</text>{{item.update_time}}
</view>
<view class="card-li" style="display: flex;justify-content: space-between;">
<view class="">
<text class="lab">商品信息：</text>{{item.store_name}}
</view>
<view class="">
x{{item.nums}}
</view>
</view>
</view>
</view>
<up-empty v-else mode="history" style="margin-top: 20vh;" text='没有更多内容了'>
</up-empty>
<view class="mask" v-if='showVerifyPop' @click="showVerifyPop=false">
<view
style="position: absolute;top: 50%;left: 50%;transform: translate(-50%,-50%);background-color: white;padding: 20rpx;">
<up-image :src="orderData.verify_img" width="710rpx" height="105rpx"></up-image>
<view style="font-weight: bold;color: #333;font-size: 26;text-align: center;margin-top: 20rpx;">
提货码 {{orderData.verify_code}}
</view>
</view>
</view>
</template>
<script setup>
import {
ref,
reactive
} from "vue"
import {
UserProductStorageLogApi
} from "@/api/order.js"
import useUserStore from "@/store/user";
const userStore = useUserStore().userInfo;
const currentTab = ref(0)
const showVerifyPop = ref(false)
const orderData = reactive({})
const tabsLst = reactive([{
name: '已预约'
},
{
name: '已提货'
},
]);
const tabsChange = (e) => {
currentTab.value = e.index
getLists()
}
const lists = ref([{}])
const getLists = async () => {
let res = await UserProductStorageLogApi({
uid: userStore.id,
status: currentTab.value
})
lists.value = res.data.lists
}
const hdClick = (item) => {
orderData.verify_code = item.verify_code
orderData.verify_img = item.verify_img
showVerifyPop.value = true
}
getLists()
</script>
<style lang="scss">
.content {
padding: 20rpx;
}
.card {
background-color: white;
border-radius: 20rpx;
// padding: 20rpx;
margin-bottom: 20rpx;
padding-bottom: 20rpx;
.head {
background-color: #50C758;
border-radius: 20rpx 20rpx 0 0;
color: white;
padding: 20rpx;
font-size: 30rpx;
display: flex;
justify-content: space-between;
}
.card-li {
padding: 0 20rpx;
margin-top: 10rpx;
.lab {
color: #989898;
}
}
}
.mask {
position: fixed;
width: 100vw;
height: 100vh;
background-color: rgba(0, 0, 0, .5);
top: 0;
left: 0;
z-index: 99999 !important;
}
</style>

428
pageQuota/vipUser/index.vue
View File

@ -1,5 +1,4 @@
<template>
<!-- 门店及身份选择 -->
<view class="" v-if="!STORE_INFO.id">
<up-modal :show="showModa" title="登录门店" @confirm="confirmStore" confirmColor='#20B128'>
<view class="slot-content">
@ -8,7 +7,7 @@
<up-input v-model="storePhone" placeholder="请输入门店手机号"></up-input>
</up-form-item>
</up-form>
<!-- <up-form labelPosition="left" label-width="100rpx">
<up-form labelPosition="left" label-width="100rpx">
<up-form-item label="身份" borderBottom>
<up-radio-group v-model="Role" placement="row">
<up-radio activeColor="#20b128" label="行业会员" :name="1"
@ -16,11 +15,10 @@
<up-radio activeColor="#20b128" label="商户" :name="4"></up-radio>
</up-radio-group>
</up-form-item>
</up-form> -->
</up-form>
</view>
</up-modal>
</view>
<!-- 门店及身份选择结束 -->
<view v-else>
<up-sticky bgColor="#fff" style="padding: 20rpx;">
@ -29,8 +27,7 @@
<up-tabs v-else :list="tabsLst2" :itemStyle="{ width: '50vw', paddingBottom: '20rpx' }" lineColor='#50C758'
:current='currentTab' @change="tabsChange1"></up-tabs>
</up-sticky>
<!-- 开通行业会员 -->
<!-- tabs0 -->
<block v-if='currentTab == 0'>
<view class="card card1">
<view class="card1-tit">
@ -55,8 +52,8 @@
</up-form-item>
<up-form-item label="">
<view @click="showPop = true" style="width: 100%;">
<up-input style="pointer-events: none" v-model="formData.address" border="none" prefixIcon="map"
readonly placeholder="点击选择地址" :customStyle="{
<up-input style="pointer-events: none" v-model="formData.address" border="none"
prefixIcon="map" readonly placeholder="点击选择地址" :customStyle="{
background: '#F3F3F3', padding: '20rpx',
'border-radius': '30rpx'
}" :placeholderStyle="{ color: '#444444' }" :prefixIconStyle="{ 'margin-right': '40rpx' }"
@ -110,9 +107,7 @@
</view>
</block>
<!-- 开通行业会员结束 -->
<!-- 追加经营资金 -->
<block v-if="currentTab == 1 && Role == 1">
<view class="card card1">
<view class="card1-tit">
@ -131,11 +126,12 @@
<up-input v-model="formData2.real_name" disabled border="none" prefixIcon="account"
placeholder="系统自动获取" color='grey'
:customStyle="{ background: '#F3F3F3', padding: '20rpx', 'border-radius': '30rpx' }"
:placeholderStyle="{ color: 'grey' }" :prefixIconStyle="{ 'margin-right': '40rpx' }"></up-input>
:placeholderStyle="{ color: 'grey' }"
:prefixIconStyle="{ 'margin-right': '40rpx' }"></up-input>
</up-form-item>
<up-form-item label="">
<up-input style="pointer-events: none" v-model="formData2.address" border="none" prefixIcon="map"
readonly color='grey' placeholder="系统自动获取" :customStyle="{
<up-input style="pointer-events: none" v-model="formData2.address" border="none"
prefixIcon="map" readonly color='grey' placeholder="系统自动获取" :customStyle="{
background: '#F3F3F3', padding: '20rpx',
'border-radius': '30rpx'
}" :placeholderStyle="{ color: 'grey' }" :prefixIconStyle="{ 'margin-right': '40rpx' }"></up-input>
@ -183,29 +179,30 @@
</view>
</block>
<!-- 追加经营资金结束 -->
<<<<<<< HEAD <!-- tabs2 -->
=======
<!-- 开通列表-会员 -->
>>>>>>> ae7660e239bd4c38b57ca2035f3e2b16b578f714
<!-- tabs2 -->
<block v-if="currentTab == 2 && Role == 1">
<view class="vip-card">
<text>当前已开通：</text>
<up-count-to :startVal="0" :endVal="count"></up-count-to>
<text>位行业会员 </text>
<text>位{{ Role == 1 ? '行业会员' : '商户' }}</text>
</view>
<view class="table">
<uni-table stripe emptyText="暂无更多数据" width="100%">
<!-- 表头行 -->
<uni-tr>
<!-- <uni-th width="20" align="center">序号</uni-th> -->
<uni-th width="50" align="center">行业会员</uni-th>
<uni-th width="50" align="center">经营资金</uni-th>
<uni-th width="50" align="center">开通时间</uni-th>
<uni-th width="50" align="center">角色</uni-th>
<uni-th width="50" align="center">状态</uni-th>
</uni-tr>
<!-- 表格数据行 -->
<uni-tr v-for="(item, index) in lists" :key="item.order_id">
<!-- <uni-td align="center">{{index+1}}</uni-td> -->
<uni-td style="font-size: 20rpx;" align="center">
<view>
{{ item.real_name }}
@ -232,20 +229,21 @@
</uni-table>
</view>
</block>
<!-- 开通列表-会员结束 -->
<<<<<<< HEAD=======<!-- 开通列表-商户 -->
>>>>>>> ae7660e239bd4c38b57ca2035f3e2b16b578f714
<block v-if="currentTab == 1 && Role == 4">
<view class="vip-card">
<text>当前已开通：</text>
<up-count-to :startVal="0" :endVal="count"></up-count-to>
<text>位商户</text>
<text>位{{ Role == 1 ? '行业会员' : '商户' }}</text>
</view>
<view class="table">
<uni-table stripe emptyText="暂无更多数据" width="100%">
<!-- 表头行 -->
<uni-tr>
<!-- <uni-th width="20" align="center">序号</uni-th> -->
<uni-th width="50" align="center">商户</uni-th>
<uni-th width="50" align="center">查看号码</uni-th>
<uni-th width="50" align="center">开通时间</uni-th>
@ -253,20 +251,21 @@
</uni-tr>
<!-- 表格数据行 -->
<uni-tr v-for="(item, index) in lists" :key="item.order_id">
<!-- <uni-td align="center">{{index+1}}</uni-td> -->
<uni-td style="font-size: 20rpx;" align="center">{{ item.nickname }}</uni-td>
<uni-td style="font-size: 20rpx;" align="center">{{ item.mobile }}</uni-td>
<uni-td style="font-size: 20rpx;" align="center">{{ item.create_time }}</uni-td>
<uni-td style="font-size: 20rpx;" align="center">
<view>已开通</view>
</uni-td>
</uni-tr>
</uni-table>
</view>
</block>
<!-- 开通列表-商户结束 -->
</view>
<view style="height: 50rpx;" />
<!-- 地址选择器 -->
<up-popup :show="showPop" @close="showPop = false" @open="showPop = true" :round="10">
<view style="padding: 20rpx;">
@ -274,8 +273,8 @@
:activeStyle="{ color: '#20B128' }"></up-tabs>
<up-line style="margin-top:20rpx "></up-line>
<view class="address-content" v-if='currentAddressIndex == 0'>
<view class="address-li" :class='{ act: item.city_code == formData.city }' v-for="item in addressList.city"
:key="item.city_code" @click="addressLiClick(0, item)">
<view class="address-li" :class='{ act: item.city_code == formData.city }'
v-for="item in addressList.city" :key="item.city_code" @click="addressLiClick(0, item)">
<text>{{ item.city_name }}</text>
<up-icon name="arrow-right" :color="item.city_code == formData.city ? '#20B128' : '#777777'" />
</view>
@ -298,22 +297,21 @@
<view class="address-li" v-for="item in addressList.village" @click="addressLiClick(3, item)"
:key="item.village_code" :class='{ act: item.village_code == formData.village }'>
<text>{{ item.village_name }}</text>
<up-icon name="arrow-right" :color="item.village_code == formData.village ? '#20B128' : '#777777'" />
<up-icon name="arrow-right"
:color="item.village_code == formData.village ? '#20B128' : '#777777'" />
</view>
</view>
<view class="address-content" v-else-if='currentAddressIndex == 4'>
<view class="address-li" :class='{ act: item.id == formData.brigade }' v-for="item in addressList.brigade"
:key="item.id" @click="addressLiClick(4, item)">
<view class="address-li" :class='{ act: item.id == formData.brigade }'
v-for="item in addressList.brigade" :key="item.id" @click="addressLiClick(4, item)">
<text>{{ item.brigade_name }}</text>
<up-icon name="arrow-right" :color="item.id == formData.brigade ? '#20B128' : '#777777'" />
</view>
</view>
</view>
</up-popup>
<!-- 会员类型选择器 -->
<up-picker :show="showPop1" :columns="columns" @confirm='conformRole' @cancel='showPop1 = false'
@close="showPop1 = false" @open="showPop1 = true" keyName='title' confirmColor='#33B83A'></up-picker>
<!-- 会员号码查看modal -->
<up-modal :show="showModal" title="电话号码" content='15884967539' :closeOnClickOverlay="true" :zoom="true"
confirmColor='#33B83A' @confirm='showModal = false' @close="showModal = false">
<view class="slot-content">
@ -322,20 +320,20 @@
</up-modal>
</template>
<script setup>
import {
import {
reactive,
ref
} from 'vue';
import useUserStore from "@/store/user";
import {
} from 'vue';
import useUserStore from "@/store/user";
import {
provinceListApi,
cityListApi,
areaListApi,
streetListApi,
villageListApi,
brigadeListApi
} from "@/api/address.js"
import {
} from "@/api/address.js"
import {
vipRechargeApi,
getRechargeListApi,
isUserShipApi,
@ -349,62 +347,60 @@ import {
getCreateLists,
getReportingSms,
getVipInfoByPhone
} from "@/api/user.js"
import Push from "@/utils/push.js"
import {
} from "@/api/user.js"
import Push from "@/utils/push.js"
import {
onPullDownRefresh,
onLoad,
onReachBottom
} from "@dcloudio/uni-app"
import {
} from "@dcloudio/uni-app"
import {
config
} from "@/config/app.js"
} from "@/config/app.js"
const currentTab = ref(0)
const showModal = ref(false)
const showPop1 = ref(false)
const Role = ref(1)
const popPhone = ref('')
const columns = ref([])
const showModa = ref(true)
const tabsLst = reactive([{
const showModal = ref(false)
const showPop1 = ref(false)
const Role = ref(1)
const popPhone = ref('')
// const range = ref({})
const columns = ref([])
const showModa = ref(true)
const storePhone = ref('')
const tabsLst = reactive([{
name: '开通行业会员'
},
{
},
{
name: '追加经营资金'
},
{
},
{
name: '已开通列表'
},
]);
const tabsLst2 = reactive([{
name: '开通商户'
},
{
name: '已开通列表'
},
]);
const vipList = reactive([1, 2, 3, 4, 5, 6, 7, 8])
},
]);
const tabsChange = (e) => {
const tabsLst2 = reactive([{
name: '开通商户'
},
{
name: '已开通列表'
},
]);
const tabsChange = (e) => {
currentTab.value = e.index
if (e.index == 2) {
getCount()
getLists()
}
}
const tabsChange1 = (e) => {
// getLists()
}
const tabsChange1 = (e) => {
currentTab.value = (e.index)
getLists()
}
}
// 用户选择的门店信息
const storePhone = ref('')
let STORE_INFO = reactive({
id: "",
})
const confirmStore = () => {
const confirmStore = () => {
getStoreByPhone({
phone: storePhone.value
}).then(res => {
@ -415,10 +411,15 @@ const confirmStore = () => {
}).catch(err => {
uni.$u.toast('未查到店铺信息，请检查手机号码')
})
}
}
// 用户选择的门店信息
let STORE_INFO = reactive({
id: ""
})
// 门店手机号保留一天
const setPhoneOneDay = () => {
// 门店手机号保留一天
const setPhoneOneDay = () => {
if (uni.getStorageSync('VIP_PHONE')) return;
const currentDate = new Date();
const nextDay = new Date(currentDate);
@ -427,28 +428,30 @@ const setPhoneOneDay = () => {
time: nextDay,
phone: storePhone.value
}));
}
const getPhoneOneDay = () => {
if (!uni.getStorageSync('VIP_PHONE')) return;
}
const getPhoneOneDay = () => {
if (uni.getStorageSync('VIP_PHONE')) {
let data = JSON.parse(uni.getStorageSync('VIP_PHONE'))
if (new Date() > data.time) {
uni.removeStorageSync('VIP_PHONE');
} else {
storePhone.value = data.phone
}
}
// 手机保留一天结束
}
}
// 手机保留一天结束
// 验证码
const cutDown = ref(0)
const flag = ref(true)
const code = ref('')
const checkPhone = (phone) => {
// 验证码
const vipList = reactive([1, 2, 3, 5, 6, 7, 8])
const cutDown = ref(0)
const flag = ref(true)
const code = ref('')
const checkPhone = (phone) => {
const regex = /^1[3-9]\d{9}$/;
return regex.test(phone) ? true : false
}
}
const getCode = async () => {
const getCode = async () => {
if (!checkPhone(formData.mobile)) return uni.$u.toast('请输入正确的手机号')
await getReportingSms({
account: formData.mobile
@ -462,9 +465,12 @@ const getCode = async () => {
clearInterval(timer);
}
}, 1000)
}
// 验证码结束
const formData = reactive({
}
// 验证码结束
const currentTab = ref(0)
const formData = reactive({
store_id: STORE_INFO.id,
mobile: "",
province: 510000,
@ -482,10 +488,25 @@ const formData = reactive({
code: '',
brigade: "",
price: "",
})
// store_id: STORE_INFO.id,
// mobile: "19130550023",
// province: 510000,
// city: '510500',
// area: "510503",
// street: "510503102",
// village: "510503102201",
// real_name: "赵明军",
// auth_code: "131197337173621549",
// address: "",
// label_name: "",
// label_id: "4",
// user_ship: '1',
// price: 0.02,
// code: '12'
})
const formData2 = reactive({
const formData2 = reactive({
store_id: STORE_INFO.id,
mobile: "",
province: 510000,
@ -502,10 +523,10 @@ const formData2 = reactive({
user_ship: '',
brigade: "",
price: "",
})
})
const getFormData2 = (data) => {
const getFormData2 = (data) => {
formData2.city = data.address_info?.city
formData2.area = data.address_info?.area
formData2.province = data.address_info?.province
@ -522,10 +543,10 @@ const getFormData2 = (data) => {
formData2.label_limit = item.limit
}
})
}
}
const phoneChnge = async (type) => {
const phoneChnge = async (type) => {
// typewhite 1 行业会员 2 经营资金
if (type == 1) {
if (!checkPhone(formData.mobile)) return
@ -536,7 +557,7 @@ const phoneChnge = async (type) => {
mobile: formData.mobile
})
formData2.mobile = formData.mobile
if (data.user_ship == 0) return;
if (data.user_ship == 4 || data.user_ship == 0) return;
if (Role.value == 1) {
uni.$u.toast('该用户已是会员请使用追加经营资金进行收款')
currentTab.value = 1
@ -545,7 +566,7 @@ const phoneChnge = async (type) => {
return uni.$u.toast('该用户已是会员，无法进行商户报备')
}
} catch (error) { }
} catch (error) {}
} else {
if (formData2.mobile.length == 0) resetFormData();
if (!checkPhone(formData2.mobile)) return
@ -573,10 +594,10 @@ const phoneChnge = async (type) => {
uni.$u.toast('查询失败');
}
}
}
}
const resetFormData = () => {
const resetFormData = () => {
for (let key in formData) {
(key != 'price') && (formData[key] = '')
}
@ -590,37 +611,38 @@ const resetFormData = () => {
formData2.province = 510000
cutDown.value = 0
currentAddressIndex.value = 0
}
}
const conformRole = (e) => {
const conformRole = (e) => {
formData.label_name = e.value[0].title
formData.label_id = e.value[0].id
showPop1.value = false
}
}
// 地址选择
const showPop = ref(false)
const currentAddressIndex = ref(0)
const currentAddressList = () => {
// 地址选择
const showPop = ref(false)
const currentAddressIndex = ref(0)
const currentAddressList = () => {
if (!formData.city) return [0, 'city'];
else if (formData.area) return [1, 'area'];
else if (formData.street) return [2, 'street'];
else if (formData.village) return [3, 'village'];
else if (formData.brigade) return [4, 'brigade'];
}
}
const addressTbasChange = (e) => {
const addressTbasChange = (e) => {
currentAddressIndex.value = e.index
}
}
const addressList = reactive({
const addressList = reactive({
city: [],
area: [],
street: [],
village: [],
brigade: []
})
const addressLiClick = async (i, item) => {
})
const addressLiClick = async (i, item) => {
if (i == 0) {
formData.city = item.city_code
tabsList[0].name = item.city_name
@ -665,14 +687,14 @@ const addressLiClick = async (i, item) => {
formData.address = tabsList[0].name + tabsList[1].name + tabsList[2].name + tabsList[3].name + tabsList[4]
.name
return currentAddressIndex.value++
}
const getCityList = async () => {
}
const getCityList = async () => {
let res = await cityListApi({
province_code: formData.province
})
addressList.city = res.data
}
const tabsList = reactive(
}
const tabsList = reactive(
[{
name: "请选择"
},
@ -694,48 +716,48 @@ const tabsList = reactive(
},
]);
let timerInvol = null
let paySuccess;
// 开起一个scoket监听用户知否支付成功
const userInfo = useUserStore().userInfo;
const connection = new Push({
let timerInvol = null
let paySuccess;
// 开起一个scoket监听用户知否支付成功
const userInfo = useUserStore().userInfo;
const connection = new Push({
url: config.WSS_URL, // websocket地址
app_key: '2ce3ce22329517213caa7dad261f5695',
});
const user_channel = connection.subscribe(`wechat_mmp_${userInfo.id}`);
user_channel.on('message', function (data) {
});
const user_channel = connection.subscribe(`wechat_mmp_${userInfo.id}`);
user_channel.on('message', function(data) {
try {
paySuccess = true
uni.hideLoading();
clearTimeout(timerInvol);
paySuccessToTabs2()
} catch (error) { }
});
// 结束
} catch (error) {}
});
// 结束
const navgo = (url) => {
const navgo = (url) => {
uni.navigateTo({
url
})
}
}
// 选择采购包
const giftIndex = ref(0)
const rechargeList = ref([])
const getRechargeList = async () => {
// 选择采购包
const giftIndex = ref(0)
const rechargeList = ref([])
const getRechargeList = async () => {
let res = await getRechargeListApi()
rechargeList.value = res.data
formData.price = rechargeList.value[0].money
}
}
const choseGift = (index) => {
const choseGift = (index) => {
giftIndex.value = index
formData.price = rechargeList.value[index].money
}
}
// 提交
const submit = async (type = 1) => {
// 提交
const submit = async (type = 1) => {
if (Role.value == 4) {
if (!formData.real_name) return uni.$u.toast('请填写真实姓名');
if (!formData.mobile) return uni.$u.toast('请填写电话号码');
@ -771,7 +793,7 @@ const submit = async (type = 1) => {
// })
// return
uni.scanCode({
success: function (res) {
success: function(res) {
if (String(res.result.length) != 18) return uni.$u.toast('二维码未扫描完整');
uni.showLoading({
title: '支付中...'
@ -823,7 +845,7 @@ const submit = async (type = 1) => {
// brigade: formData.brigade
// })
uni.scanCode({
success: function (res) {
success: function(res) {
if (String(res.result.length) != 18) return uni.$u.toast('二维码未扫描完整');
uni.showLoading({
title: '支付中...'
@ -842,11 +864,11 @@ const submit = async (type = 1) => {
});
}
}
}
}
const rePay = (item) => {
const rePay = (item) => {
uni.scanCode({
success: function (res) {
success: function(res) {
if (String(res.result.length) != 18) return uni.$u.toast('二维码未扫描完整');
uni.showLoading({
title: '等待用户支付'
@ -864,14 +886,14 @@ const rePay = (item) => {
})
}
});
}
}
const tofixedPrice = (type = 1) => {
const tofixedPrice = (type = 1) => {
if (type == 2) return formData2.price = (+formData2.price).toFixed(2)
}
}
// 支付成功后清除formData并且切换tabs2
const paySuccessToTabs2 = () => {
// 支付成功后清除formData并且切换tabs2
const paySuccessToTabs2 = () => {
uni.hideLoading()
uni.showToast({
title: '支付成功',
@ -885,27 +907,27 @@ const paySuccessToTabs2 = () => {
}, 500); // 延迟1秒执行
}
});
}
}
// 邀请用户数
let where = {
// 邀请用户数
let where = {
page_no: 1,
page_size: 25,
loadingOver: false
}
}
const count = ref(0)
const getCount = async () => {
const count = ref(0)
const getCount = async () => {
if (Role.value == 4) return;
let res = await rechargeCountApi({
store_id: STORE_INFO.id
})
count.value = res.data.count
}
}
// 邀请列表
const lists = ref([])
const getLists = async () => {
// 邀请列表
const lists = ref([])
const getLists = async () => {
where.loadingOver = false
where.page_no = 1
where.page_size = 25
@ -925,10 +947,10 @@ const getLists = async () => {
count.value = res.data.count
}
}
}
const upadtaStatus = (item) => {
const upadtaStatus = (item) => {
updataOrderApi({
order_no: item.order_id,
recharge: 1
@ -937,27 +959,27 @@ const upadtaStatus = (item) => {
getLists()
})
}
}
onLoad(() => {
onLoad(() => {
getUserShip().then(res => {
columns.value = [res.data.lists]
})
getPhoneOneDay()
getCityList()
getRechargeList()
})
})
onPullDownRefresh(() => {
onPullDownRefresh(() => {
getCount()
getLists()
setTimeout(() => {
uni.stopPullDownRefresh()
}, 1000)
})
})
onReachBottom(async () => {
onReachBottom(async () => {
if (where.loadingOver) return;
where.page_no++;
if (Role.value == 1) {
@ -980,11 +1002,11 @@ onReachBottom(async () => {
}
lists.value.push(...res.data.lists)
}
})
})
</script>
<style lang='scss'>
.tabs {
.tabs {
background-color: #fff;
width: 100vw;
box-sizing: border-box;
@ -1014,17 +1036,17 @@ onReachBottom(async () => {
.actLine {
left: calc(75vw - 35rpx);
}
}
}
.card {
.card {
width: 710rpx;
margin: 20rpx auto;
background-color: #fff;
box-sizing: border-box;
border-radius: 10rpx;
}
}
.card1 {
.card1 {
padding: 30rpx;
.card1-tit {
@ -1040,9 +1062,9 @@ onReachBottom(async () => {
text-align: center;
margin-top: 20rpx;
}
}
}
.submit-btn {
.submit-btn {
/* height: 200rpx; */
position: fixed;
bottom: 50rpx;
@ -1050,10 +1072,10 @@ onReachBottom(async () => {
left: 50%;
transform: translateX(-50%);
}
}
.vip-card {
.vip-card {
width: 690rpx;
height: 270rpx;
background-image: url('https://lihai001.oss-cn-chengdu.aliyuncs.com/attach/4a92b202406162207212332.png');
@ -1072,17 +1094,17 @@ onReachBottom(async () => {
color: #7B5232;
}
}
}
.table {
.table {
width: 710rpx;
box-sizing: border-box;
font-size: 30rpx;
margin: 0 auto;
}
}
.address-content {
.address-content {
padding: 20rpx;
height: 60vh;
overflow-y: auto;
@ -1099,30 +1121,30 @@ onReachBottom(async () => {
.act {
color: #20B128;
}
}
}
.uni-table-th {
.uni-table-th {
padding: 10rpx 0 !important;
}
}
.uni-table-td {
.uni-table-td {
padding: 10rpx 0 !important;
}
}
.slot-content {
.slot-content {
/* padding-bottom: 50rpx; */
}
}
.code-btn {
.code-btn {
display: flex;
align-items: center;
}
}
.btn-text {
.btn-text {
color: #20B128;
}
}
.link {
.link {
padding-left: 20rpx;
color: #2F6BF2;
font-size: 28rpx;
@ -1131,9 +1153,9 @@ onReachBottom(async () => {
text-decoration: underline;
text-underline-offset: 10rpx;
cursor: pointer;
}
}
.link::after {
.link::after {
content: '';
width: 12rpx;
height: 12rpx;
@ -1143,9 +1165,9 @@ onReachBottom(async () => {
transform: translateY(-50%);
border-radius: 12rpx;
left: 0;
}
}
.gift-pack {
.gift-pack {
display: flex;
justify-content: space-between;
flex-wrap: wrap;
@ -1180,5 +1202,5 @@ onReachBottom(async () => {
}
}
</style>

9
pages.json
View File

@ -245,17 +245,10 @@
{
"path": "asset/index",
"style": {
"navigationBarTitleText": "用户资产",
"navigationBarTitleText": "会员资产",
"enablePullDownRefresh": true
}
},
{
"path": "asset/lists",
"style": {
"navigationBarTitleText": "预约记录",
"enablePullDownRefresh": false
}
},
{
"path": "Gifts/index",
"style": {

13
pages/index/index.vue
View File

@ -168,15 +168,15 @@
<view class="shop-content-li-r" style="color:#FC452F ;">￥<text
style="font-size: 30rpx;">{{item[priceKey.price]}}</text>/{{ item.unit_name }}
</view>
<view class="tag" v-if="item.tag">
<view class="tag">
<view class="icon" />
{{item.tag}}
赠10%品牌礼品券
</view>
</view>
<view class="shop-content-li" style="color: #999999;" v-if="priceKey.off_activity==1">
<!-- <view class="shop-content-li" style="color: #999999;" v-if="priceKey.off_activity==1">
<view class="shop-content-li-l">原价</view>
<view class="shop-content-li-r line-through">￥{{item[priceKey.op_price]}}</view>
</view>
</view> -->
<view class="shop-content-li" v-else>
<view class="shop-content-li-l">售价</view>
@ -231,8 +231,7 @@
</view>
</view>
<goodPopup ref="goodRef" :priceKey='priceKey' :show="showGoodPopup" @close="showGoodPopup = false"
@change="changeGood" />
<goodPopup ref="goodRef" :show="showGoodPopup" @close="showGoodPopup = false" @change="changeGood" />
<u-overlay :show="showOverlay" @click="showOverlay = false">
<view class="warp">
@ -294,7 +293,7 @@
} from "@/api/multipleShop.js";
import useUserStore from "@/store/user";
const vipList = reactive([1, 2, 3, 4, 5, 6, 7, 8])
const vipList = reactive([1, 2, 3, 5, 6, 7, 8])
const userStore = useUserStore();
const STORE_INFO = reactive({
id: '',

4
pages/login/login.vue
View File

@ -16,10 +16,10 @@
<up-button @click="weixinLogin" color="#20B128" size="large"><up-icon color="#fff"
size="28"></up-icon>手机号快捷登录</up-button>
</view>
<view class="btn" v-if="config.ENV !='prod'">
<!-- <view class="btn">
<up-button @click="navgo('/pages/login/test')" color="#20B128" size="large"><up-icon
name="account-fill" color="#fff" size="28"></up-icon>真-手机号快捷登录</up-button>
</view>
</view> -->
<!-- <view class="btn">
<up-button @click="officialCode" color="#20B128" size="large"><up-icon name="weixin-fill" color="#fff"
size="28"></up-icon>公众号授权</up-button>

12
pages/my/my.vue
View File

@ -24,7 +24,7 @@
<template>
<view style="flex-grow: 1;overflow-y: auto;">
<view class="user-info"
:style="{backgroundImage: [0].includes(userInfo.user_ship)?'url(https://lihai001.oss-cn-chengdu.aliyuncs.com/def/e3a7b202404261113002322.webp)':'url(https://lihai001.oss-cn-chengdu.aliyuncs.com/attach/aace1202407021022357574.png)' }">
:style="{backgroundImage: [0,4].includes(userInfo.user_ship)?'url(https://lihai001.oss-cn-chengdu.aliyuncs.com/def/e3a7b202404261113002322.webp)':'url(https://lihai001.oss-cn-chengdu.aliyuncs.com/attach/aace1202407021022357574.png)' }">
<view class="u-card">
<view style="display: flex;" @click="updataInfp">
<up-image :src="userInfo.avatar" mode="aspectFill" width="112rpx" height="112rpx"
@ -36,7 +36,7 @@
<view style="margin:0 20rpx;">
{{userInfo.id}}
</view>
<view v-if="![0].includes(userInfo.user_ship)"
<view v-if="![0,4].includes(userInfo.user_ship)"
style="display: flex;align-items: center;background-color: #F6EECD;padding: 4rpx 10rpx;border-radius: 20rpx;">
<view style="margin-right: 10rpx;">
<up-icon
@ -116,9 +116,8 @@
<view class="card">
<up-cell-group>
<!-- <up-cell v-if="userInfo.user_ship==1" title="赠品区" :isLink="true" url="/pageQuota/Gifts/index"></up-cell> -->
<!-- <up-cell title="我的资产" :isLink="true" url="/pageQuota/asset/index"></up-cell>
<up-cell title="预约记录" :isLink="true" url="/pageQuota/asset/lists"></up-cell> -->
<!-- <up-cell v-if="userInfo.user_ship==1" title="赠品区" :isLink="true" url="/pageQuota/Gifts/index"></up-cell>
<up-cell title="我的资产" :isLink="true" url="/pageQuota/asset/index"></up-cell> -->
<up-cell title="我的地址" :isLink="true" url="/pagesOrder/addressList/addressList"></up-cell>
<up-cell title="支付密码" :isLink="true" url="/pagesOrder/setPayPassword/index"></up-cell>
</up-cell-group>
@ -227,6 +226,7 @@
const showPop = ref(false)
const updataInfp = () => {
console.log(5454)
showPop.value = true
}
@ -291,7 +291,7 @@
userInfo.value = res.data;
formData.avatar = res.data.avatar
formData.nick_name = res.data.nickname
if (![0].includes(res.data.user_ship)) {
if (![0, 4].includes(res.data.user_ship)) {
uni.setNavigationBarColor({
frontColor: "#000000",
backgroundColor: "#EAFFE1"

2
pagesOrder/settle/settle.vue
View File

@ -98,7 +98,7 @@
<view class="row" v-if="[4,5,6].includes(userInfo.user_ship)" style="color: red;">
<view>优惠减免</view>
<view>
<text>-¥</text>{{ c_price(orderInfo.frozen_money, 0) }}<text>.{{ c_price(orderInfo.frozen_money, 1) }}</text>
<text>-¥</text>{{ c_price(orderInfo.activity_price, 0) }}<text>.{{ c_price(orderInfo.activity_price, 1) }}</text>
</view>
</view>
<view class="row" v-if="userInfo.user_ship==1 ">