hly
/
aluminium-trading-uniapp-240925
generated from hly/uniapp-shop-templates
1
0
Fork 0
Code Issues 0 Pull Requests 0 Projects 0 Releases 0 Wiki Activity
Browse Source

对接登录

master
前端-胡立永 1 year ago
parent
cf46f82062
commit
e2cc594db3
5 changed files with 450 additions and 432 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +1
    -0
      App.vue
  2. +9
    -2
      pages_order/auth/loginAndRegisterAndForgetPassword.vue
  3. +10
    -4
      pages_order/auth/selectionIdentity.vue
  4. +429
    -425
      pages_order/order/offerOrBillLading.vue
  5. +1
    -1
      store/store.js

+ 1
- 0
App.vue View File

@ -4,6 +4,7 @@
},
onShow: function() {
// this.$store.commit('initConfig')
this.$store.commit('getUserInfo')
},
onHide: function() {
}


+ 9
- 2
pages_order/auth/loginAndRegisterAndForgetPassword.vue View File

@ -123,8 +123,8 @@
titleList: ['注册', '登录', '重置密码'],
checkboxValue: [],
form: {
username: 'h1',
password: 'l',
username: '19330214982',
password: '123456',
loginModel : 0,
captcha : '',
},
@ -154,6 +154,13 @@
return
}
if(!this.$utils.verificationPhone(this.form.username)){
return uni.showToast({
title: '账号请输入合法的手机号',
icon:'none'
})
}
if(this.titleIndex == 0){
// 注册
this.$api('registerUser', this.form, res =>{


+ 10
- 4
pages_order/auth/selectionIdentity.vue View File

@ -5,7 +5,7 @@
@leftClick="$utils.navigateBack" />
<view class="container">
<view class="title">{{ $t('components.selectIdentity') }}</view>
<view class="button-group">
<!--供应商-->
@ -35,15 +35,21 @@
export default {
computed: {
...mapGetters(['userShop', "userInfo", 'buy', 'shopData']),
...mapGetters(['userShop', "userInfo"]),
},
methods: {
selectIdentity(identity) {
// if (userInfo)
if (identity == 0 && this.buy) {
if (identity == 0 && this.$store.state.buy) {
this.$store.commit('setShop', false)
} else if (identity == 1 && this.shopData) {
uni.reLaunch({
url: '/pages/index/index'
})
} else if (identity == 1 && this.$store.state.shopData) {
this.$store.commit('setShop', true)
uni.reLaunch({
url: '/pages/index/index'
})
} else {
uni.navigateTo({
url: `/pages_order/auth/registerShop?identity=${identity}`


+ 429
- 425
pages_order/order/offerOrBillLading.vue View File

@ -1,434 +1,438 @@
<template>
<view class="page">
<navbar :title="titleList[titleIndex]" leftClick @leftClick="$utils.navigateBack"/>
<view class="frame">
<view class="title">
<span
style="width: 10rpx;height: 40rpx;background-color: #1f1c39;border-radius: 10rpx;overflow: hidden;"></span>
<span>{{ $t('other.aluminumProducts') }}</span>
</view>
<view class="basic-info">
<!--供应商名称-->
<view class="item" v-if="titleIndex == 1">
<view>{{ $t('other.supplierName') }}</view>
<view>华南铝业有限公司</view>
</view>
<!--商品规格-->
<view class="item">
<view>{{ $t('components.productSpe') }}</view>
<view>铝制品(Al>96%)</view>
</view>
<!--提货地点-->
<view class="currentRegion">
<view>{{ $t('components.pickupLocation') }}</view>
<view @click.stop="selectAddr">
<input class="input"
disabled
v-model="form.currentRegion"
:placeholder=" $t('components.selectRegion')">
</input>
<view class="orientation">
<img src="../../static/image/address/selectIcon.png"
style="width:30rpx;height: 30rpx;margin:5rpx 5rpx 5rpx 5rpx;">
</view>
</view>
</view>
<!--详细地址-->
<view class="item">
<view>{{ $t('components.detailedAddress') }}</view>
<view>
<input v-model="form.address" :placeholder="$t('components.enterDetailedAddress') " clearable></input>
</view>
</view>
<!--交货日期-->
<view class="delivery-date">
<view>{{ $t('components.deliveryDate') }}</view>
<view class="value">
<view class="dateTimeCls">
<view class="date" @click="startDateOpen">
{{ form.deliveryDate }}
<uv-datetime-picker ref="startDateRef" v-model="form.deliveryDate" mode="date"
@confirm="startDateChange"></uv-datetime-picker>
</view>
<view class="img">
>
</view>
</view>
</view>
</view>
<!--暂定数量-->
<view class="tentativeQuantity">
<view class="key">{{ $t('other.tentativeQuantity') }}</view>
<view class="value">
<uv-number-box v-model="form.tentativeQuantity"></uv-number-box>
</view>
</view>
<!--单价-->
<view class="item">
<view>{{ $t('components.unitPrice') }}</view>
<view>
<input disabled clearable ></input>
</view>
</view>
<!--提交报价和提交审核-->
<view class="btns">
<span @click="confirmBtn" class="ljxd">
{{ titleIndex == 0 ? $t('other.submitQuotation') : $t('other.submitReview') }}
</span>
<span @click="contactUs" class="lxwm">
{{ $t('components.contactUs') }}
</span>
<span class="tip">{{ $t('components.contactTip') }}</span>
</view>
</view>
</view>
<!-- 联系客服弹框 -->
<customerServicePopup ref="customerServicePopup"/>
</view>
<view class="page">
<navbar :title="titleList[titleIndex]" leftClick @leftClick="$utils.navigateBack" />
<view class="frame">
<view class="title">
<span
style="width: 10rpx;height: 40rpx;background-color: #1f1c39;border-radius: 10rpx;overflow: hidden;"></span>
<span>{{ $t('other.aluminumProducts') }}</span>
</view>
<view class="basic-info">
<!--供应商名称-->
<view class="item" v-if="titleIndex == 1">
<view>{{ $t('other.supplierName') }}</view>
<view>华南铝业有限公司</view>
</view>
<!--商品规格-->
<view class="item">
<view>{{ $t('components.productSpe') }}</view>
<view>铝制品(Al>96%)</view>
</view>
<!--提货地点-->
<view class="currentRegion">
<view>{{ $t('components.pickupLocation') }}</view>
<view @click.stop="selectAddr">
<input class="input" disabled v-model="form.currentRegion"
:placeholder=" $t('components.selectRegion')">
</input>
<view class="orientation">
<img src="../../static/image/address/selectIcon.png"
style="width:30rpx;height: 30rpx;margin:5rpx 5rpx 5rpx 5rpx;">
</view>
</view>
</view>
<!--详细地址-->
<view class="item">
<view>{{ $t('components.detailedAddress') }}</view>
<view>
<input v-model="form.address" :placeholder="$t('components.enterDetailedAddress') "
clearable></input>
</view>
</view>
<!--交货日期-->
<view class="delivery-date">
<view>{{ $t('components.deliveryDate') }}</view>
<view class="value">
<view class="dateTimeCls">
<view class="date" @click="startDateOpen">
{{ form.deliveryDate }}
<uv-datetime-picker ref="startDateRef" v-model="form.deliveryDate" mode="date"
@confirm="startDateChange"></uv-datetime-picker>
</view>
<view class="img">
>
</view>
</view>
</view>
</view>
<!--暂定数量-->
<view class="tentativeQuantity">
<view class="key">{{ $t('other.tentativeQuantity') }}</view>
<view class="value">
<uv-number-box v-model="form.tentativeQuantity"></uv-number-box>
</view>
</view>
<!--单价-->
<view class="item">
<view>{{ $t('components.unitPrice') }}</view>
<view>
<input disabled clearable></input>
</view>
</view>
<!--提交报价和提交审核-->
<view class="btns">
<span @click="confirmBtn" class="ljxd">
{{ titleIndex == 0 ? $t('other.submitQuotation') : $t('other.submitReview') }}
</span>
<span @click="contactUs" class="lxwm">
{{ $t('components.contactUs') }}
</span>
<span class="tip">{{ $t('components.contactTip') }}</span>
</view>
</view>
</view>
<!-- 联系客服弹框 -->
<customerServicePopup ref="customerServicePopup" />
</view>
</template>
<script>
import topbar from "@/components/base/topbar.vue";
import tabber from "@/components/base/tabbar.vue";
import customerServicePopup from "@/components/config/customerServicePopup.vue";
import Position from "@/utils/position";
import dayjs from "dayjs";
export default {
name: "offer",
components: {customerServicePopup, tabber, topbar},
onLoad(options) {
this.titleIndex = options.titleIndex;
},
data() {
return {
titleIndex:0,
titleList: [
this.$t('pages.index.index.supplierQuotation'),
this.$t('pages.index.index.supplierBillLading')
],
form: {
address: "",
longitude: "",
latitude: "",
deliveryDate: dayjs(new Date()).format("YYYY-MM-DD"),
}
}
},
methods: {
// 提交报价/提交审核
confirmBtn() {
console.log(this.form);
},
startDateChange(val) {
this.$nextTick(() => {
this.form.deliveryDate = dayjs(val.value).format("YYYY-MM-DD")
});
},
startDateOpen() {
this.$refs.startDateRef.open();
},
// 联系我们
contactUs() {
this.$refs.customerServicePopup.open()
},
//地图上选择地址
selectAddr() {
Position.getLocation(res => {
Position.selectAddress(res.longitude, res.latitude, success => {
this.setAddress(success)
})
})
Position.getLocationDetail(res => {
console.log(res);
this.form.address = res
})
},
},
}
import topbar from "@/components/base/topbar.vue";
import tabber from "@/components/base/tabbar.vue";
import customerServicePopup from "@/components/config/customerServicePopup.vue";
import Position from "@/utils/position";
import dayjs from "dayjs";
export default {
name: "offer",
components: {
customerServicePopup,
tabber,
topbar
},
onLoad(options) {
this.titleIndex = options.titleIndex;
},
data() {
return {
titleIndex: 0,
titleList: [
// 0 供应商报价
this.$t('pages.index.index.supplierQuotation'),
this.$t('pages.index.index.supplierBillLading')
],
form: {
address: "",
longitude: "",
latitude: "",
deliveryDate: dayjs(new Date()).format("YYYY-MM-DD"),
}
}
},
methods: {
// 提交报价/提交审核
confirmBtn() {
console.log(this.form);
},
startDateChange(val) {
this.$nextTick(() => {
this.form.deliveryDate = dayjs(val.value).format("YYYY-MM-DD")
});
},
startDateOpen() {
this.$refs.startDateRef.open();
},
// 联系我们
contactUs() {
this.$refs.customerServicePopup.open()
},
//地图上选择地址
selectAddr() {
Position.getLocation(res => {
Position.selectAddress(res.longitude, res.latitude, success => {
this.setAddress(success)
})
})
Position.getLocationDetail(res => {
console.log(res);
this.form.address = res
})
},
},
}
</script>
<style scoped lang="scss">
.page {
height: 100vh;
.frame {
background-color: #FFF;
.title {
display: flex;
font-size: 30rpx;
font-weight: 700;
padding: 0rpx 0 0rpx 20rpx;
margin: 20rpx 0 0 0;
> span:nth-of-type(1) {
margin: 4rpx 0 0 8rpx;
background-color: #FFF;
}
> span:nth-of-type(2) {
margin: 0 0 0 8rpx;
background-color: #FFF;
}
}
.basic-info {
display: flex;
flex-direction: column;
gap: 10rpx;
//margin-top: 20rpx;
padding: 20rpx 20rpx 20rpx 20rpx;
.delivery-date {
display: flex;
align-items: center;
background-color: #FFF;
height: 80rpx;
// margin: 10rpx 0 0 0;
padding: 10rpx 0 0 20rpx;
> view:nth-of-type(1) {
width: 30%;
// font-weight: 700;
}
.value {
width: 70%;
border-radius: 10rpx;
overflow: hidden;
.dateTimeCls {
display: flex;
align-items: center;
justify-content: space-between;
width: 100%;
height: 80%;
//border: 1px solid #b0b2b3;
padding: 5rpx;
border-radius: 20rpx;
.date {
font-size: 30rpx;
display: flex;
align-items: center;
width: 80%;
height: 100%;
color: #000;
}
.img {
display: flex;
justify-content: center;
align-items: center;
//margin-left: 50rpx;
width: 20%;
//height: 100%;
}
}
}
}
.tentativeQuantity {
display: flex;
align-items: center;
background-color: #FFF;
height: 80rpx;
// margin: 10rpx 0 0 0;
padding: 10rpx 0 0 20rpx;
.key {
width: 30%;
}
.value {
width: 70%;
border-radius: 10rpx;
overflow: hidden;
}
}
.Tip {
display: flex;
align-items: center;
justify-content: center;
.span {
color: #999;
font-size: 24rpx;
}
}
.btns {
width: 100%;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
gap: 20rpx;
.ljxd {
display: flex;
align-items: center;
justify-content: center;
width: 500rpx;
height: 70rpx;
border-radius: 40rpx;
color: #FFF;
font-size: 28rpx;
margin: 20rpx 10rpx 0 0;
background: $uni-color;
//margin-top: 20rpx;
border-radius: 40rpx;
}
.lxwm {
display: flex;
align-items: center;
justify-content: center;
width: 500rpx;
height: 70rpx;
border-radius: 40rpx;
color: #000000;
font-size: 28rpx;
margin: 20rpx 10rpx 0 0;
background: #f1f1f1;
//margin-top: 20rpx;
border-radius: 40rpx;
}
.tip {
display: flex;
align-items: center;
justify-content: center;
font-size: 24rpx;
color: #999;
//width: 500rpx;
}
}
.item {
display: flex;
align-items: center;
background-color: #FFF;
height: 80rpx;
// margin: 10rpx 0 0 0;
padding: 10rpx 0 0 20rpx;
> view:nth-of-type(1) {
width: 30%;
// font-weight: 700;
}
> view:nth-of-type(2) {
width: 70%;
border-radius: 10rpx;
overflow: hidden;
input {
background-color: #FFF;
font-size: 28rpx;
padding: 16rpx 8rpx 16rpx 15rpx;
}
}
}
.performanceBond {
display: flex;
align-items: center;
background-color: #FFF;
height: 80rpx;
// margin: 10rpx 0 0 0;
padding: 10rpx 0 0 20rpx;
.key {
width: 30%;
// font-weight: 700;
}
.value {
width: 70%;
border-radius: 10rpx;
overflow: hidden;
input {
background-color: #FFF;
font-size: 28rpx;
padding: 16rpx 8rpx 16rpx 15rpx;
}
}
}
.currentRegion {
display: flex;
align-items: center;
background-color: #FFF;
height: 80rpx;
// margin: 10rpx 0 0 0;
padding: 10rpx 0 0 20rpx;
> view:nth-of-type(1) {
width: 30%;
// font-weight: 700;
}
> view:nth-of-type(2) {
width: 70%;
padding: 0 20rpx 0 0;
display: flex;
.input {
background-color: #f5f5f5;
// color: #a4a4a4;
font-size: 28rpx;
padding: 8rpx 8rpx 8rpx 15rpx;
width: 350rpx;
}
.orientation {
display: flex;
padding: 10rpx 10rpx 10rpx 20rpx;
font-size: 30rpx;
color: #FBAB32;
flex-direction: column;
justify-content: center;
align-items: center;
}
}
}
}
}
}
.page {
height: 100vh;
.frame {
background-color: #FFF;
.title {
display: flex;
font-size: 30rpx;
font-weight: 700;
padding: 0rpx 0 0rpx 20rpx;
margin: 20rpx 0 0 0;
>span:nth-of-type(1) {
margin: 4rpx 0 0 8rpx;
background-color: #FFF;
}
>span:nth-of-type(2) {
margin: 0 0 0 8rpx;
background-color: #FFF;
}
}
.basic-info {
display: flex;
flex-direction: column;
gap: 10rpx;
//margin-top: 20rpx;
padding: 20rpx 20rpx 20rpx 20rpx;
.delivery-date {
display: flex;
align-items: center;
background-color: #FFF;
height: 80rpx;
// margin: 10rpx 0 0 0;
padding: 10rpx 0 0 20rpx;
>view:nth-of-type(1) {
width: 30%;
// font-weight: 700;
}
.value {
width: 70%;
border-radius: 10rpx;
overflow: hidden;
.dateTimeCls {
display: flex;
align-items: center;
justify-content: space-between;
width: 100%;
height: 80%;
//border: 1px solid #b0b2b3;
padding: 5rpx;
border-radius: 20rpx;
.date {
font-size: 30rpx;
display: flex;
align-items: center;
width: 80%;
height: 100%;
color: #000;
}
.img {
display: flex;
justify-content: center;
align-items: center;
//margin-left: 50rpx;
width: 20%;
//height: 100%;
}
}
}
}
.tentativeQuantity {
display: flex;
align-items: center;
background-color: #FFF;
height: 80rpx;
// margin: 10rpx 0 0 0;
padding: 10rpx 0 0 20rpx;
.key {
width: 30%;
}
.value {
width: 70%;
border-radius: 10rpx;
overflow: hidden;
}
}
.Tip {
display: flex;
align-items: center;
justify-content: center;
.span {
color: #999;
font-size: 24rpx;
}
}
.btns {
width: 100%;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
gap: 20rpx;
.ljxd {
display: flex;
align-items: center;
justify-content: center;
width: 500rpx;
height: 70rpx;
border-radius: 40rpx;
color: #FFF;
font-size: 28rpx;
margin: 20rpx 10rpx 0 0;
background: $uni-color;
//margin-top: 20rpx;
border-radius: 40rpx;
}
.lxwm {
display: flex;
align-items: center;
justify-content: center;
width: 500rpx;
height: 70rpx;
border-radius: 40rpx;
color: #000000;
font-size: 28rpx;
margin: 20rpx 10rpx 0 0;
background: #f1f1f1;
//margin-top: 20rpx;
border-radius: 40rpx;
}
.tip {
display: flex;
align-items: center;
justify-content: center;
font-size: 24rpx;
color: #999;
//width: 500rpx;
}
}
.item {
display: flex;
align-items: center;
background-color: #FFF;
height: 80rpx;
// margin: 10rpx 0 0 0;
padding: 10rpx 0 0 20rpx;
>view:nth-of-type(1) {
width: 30%;
// font-weight: 700;
}
>view:nth-of-type(2) {
width: 70%;
border-radius: 10rpx;
overflow: hidden;
input {
background-color: #FFF;
font-size: 28rpx;
padding: 16rpx 8rpx 16rpx 15rpx;
}
}
}
.performanceBond {
display: flex;
align-items: center;
background-color: #FFF;
height: 80rpx;
// margin: 10rpx 0 0 0;
padding: 10rpx 0 0 20rpx;
.key {
width: 30%;
// font-weight: 700;
}
.value {
width: 70%;
border-radius: 10rpx;
overflow: hidden;
input {
background-color: #FFF;
font-size: 28rpx;
padding: 16rpx 8rpx 16rpx 15rpx;
}
}
}
.currentRegion {
display: flex;
align-items: center;
background-color: #FFF;
height: 80rpx;
// margin: 10rpx 0 0 0;
padding: 10rpx 0 0 20rpx;
>view:nth-of-type(1) {
width: 30%;
// font-weight: 700;
}
>view:nth-of-type(2) {
width: 70%;
padding: 0 20rpx 0 0;
display: flex;
.input {
background-color: #f5f5f5;
// color: #a4a4a4;
font-size: 28rpx;
padding: 8rpx 8rpx 8rpx 15rpx;
width: 350rpx;
}
.orientation {
display: flex;
padding: 10rpx 10rpx 10rpx 20rpx;
font-size: 30rpx;
color: #FBAB32;
flex-direction: column;
justify-content: center;
align-items: center;
}
}
}
}
}
}
</style>

+ 1
- 1
store/store.js View File

@ -10,7 +10,7 @@ import { date } from '../uni_modules/uv-ui-tools/libs/function/test';
const store = new Vuex.Store({
state: {
configList: [], //配置列表
shop : false,
shop : true,
userInfo : {}, //用户信息
shopData : {},
buy : {},


Write Preview
Loading…
Cancel
Save