angelo
/
web-base-h5
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(prettier): add prettier for code

This commit is contained in:
ywk 2025-04-08 17:51:03 +08:00
parent 1648e0da0d
commit 08545536d3
10 changed files with 1511 additions and 2264 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
.prettierignore Normal file
View File

@ -0,0 +1,27 @@
# Dependencies
node_modules/
# Build output
dist/
build/
out/
unpackage/ # uni-app output
# Lock files
package-lock.json
yarn.lock
# Git
.git/
# OS generated
.DS_Store
# uni-app specific
uni_modules/
# Logs
*.log
# Docs
docs/

8
.prettierrc.json Normal file
View File

@ -0,0 +1,8 @@
{
"semi": false,
"singleQuote": true,
"trailingComma": "es5",
"printWidth": 80,
"tabWidth": 2,
"arrowParens": "avoid"
}

6
config/regiest.js
View File

@ -43,8 +43,7 @@ export const validPhone = (params) => http.post('/sale/api/order/valid-phone', p
export const upgRel = (params) => http.post('/sale/api/order/validate-upg-rel', params)
//升级复购单确认
export const confirmOthOrder = (params) => http.post('/sale/api/order/confirm-oth-order', params)
//新人礼包确认
export const confirmGiftOrder = (params) => http.post('/sale/api/order/confirm-gift-order', params)
//嗨粉确认订单
export const confirmFunOrder = (params) => http.post('/sale/api/order/confirm-fun-order', params)
//协议
@ -74,8 +73,7 @@ responseType: 'blob',})
//特殊信息列表
export const specialList = (params) => http.get('/member/api/member-special/special-list', { params })
// 自营合作支付校验
export const checkPay = (params) => http.post('/sale/api/order/check-pay-type', params)
// 创客空间接口
export const queryCard = (params) => http.post('/sale/api/wares/query-cabin-card', params)

32
package-lock.json generated
View File

@ -24,7 +24,8 @@
},
"devDependencies": {
"less": "^3.13.1",
"less-loader": "^4.1.0"
"less-loader": "^4.1.0",
"prettier": "^3.5.3"
}
},
"node_modules/@babel/helper-string-parser": {
@ -3797,15 +3798,16 @@
}
},
"node_modules/prettier": {
"version": "2.8.8",
"resolved": "https://mirrors.cloud.tencent.com/npm/prettier/-/prettier-2.8.8.tgz",
"integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==",
"optional": true,
"version": "3.5.3",
"resolved": "https://registry.npmjs.org/prettier/-/prettier-3.5.3.tgz",
"integrity": "sha512-QQtaxnoDJeAkDvDKWCLiwIXkTgRhwYDEQCghU9Z6q03iyek/rxRh/2lC3HB7P8sWT2xC/y5JDctPLBIGzHKbhw==",
"dev": true,
"license": "MIT",
"bin": {
"prettier": "bin-prettier.js"
"prettier": "bin/prettier.cjs"
},
"engines": {
"node": ">=10.13.0"
"node": ">=14"
},
"funding": {
"url": "https://github.com/prettier/prettier?sponsor=1"
@ -5261,6 +5263,22 @@
"prettier": "^1.18.2 || ^2.0.0"
}
},
"node_modules/vue-tree-color/node_modules/prettier": {
"version": "2.8.8",
"resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz",
"integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==",
"license": "MIT",
"optional": true,
"bin": {
"prettier": "bin-prettier.js"
},
"engines": {
"node": ">=10.13.0"
},
"funding": {
"url": "https://github.com/prettier/prettier?sponsor=1"
}
},
"node_modules/vue-tree-color/node_modules/vue": {
"version": "2.7.16",
"resolved": "https://mirrors.cloud.tencent.com/npm/vue/-/vue-2.7.16.tgz",

7
package.json
View File

@ -19,10 +19,13 @@
},
"devDependencies": {
"less": "^3.13.1",
"less-loader": "^4.1.0"
"less-loader": "^4.1.0",
"prettier": "^3.5.3"
},
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
"test": "echo \"Error: no test specified\" && exit 1",
"format": "prettier --write .",
"check-format": "prettier --check ."
},
"repository": {
"type": "git",

6
pages.json
View File

@ -386,12 +386,6 @@
"navigationBarTitleText": "注册专区"
}
},
{
"path": "pages/other/newGiftPay",
"style": {
"navigationBarTitleText": "新人礼包"
}
},
{
"path": "pages/other/haiConfirm",
"style": {

92
pages/market/activeArea/activeArea.vue
View File

@ -1,60 +1,56 @@
<template>
<view class="content">
<view @click="goDetail(item)"
<view
@click="goDetail(item)"
class="list_content"
v-for="item,index in dataList"
:key="index">
v-for="(item, index) in dataList"
:key="index"
>
<view class="actCover">
<image :src="item.actCover"
mode=""></image>
<image :src="item.actCover" mode=""></image>
</view>
<view class="list_right">
<view class="right_title">{{item.actName}}</view>
<view class="right_title">{{ item.actName }}</view>
<!-- <view class="right_jies">{{item.actExplain}}</view> -->
<view class="right_time">{{item.actStartDate}}-{{ item.actEndDate }}</view>
<view class="right_time"
>{{ item.actStartDate }}-{{ item.actEndDate }}</view
>
<view class="">
<u-button @click.native.stop="getGift(item)"
v-if="item.existNewPeopleGift == 0"
class="thebtn"
shape="circle"
text="领取礼包"
color="#D61820"></u-button>
<u-button @click.native.stop="getGift(item)"
<u-button
@click.native.stop="getGift(item)"
v-if="item.existDrawNum == 0"
class="thebtn"
shape="circle"
text="抽奖"
color="#D61820"></u-button>
<u-button class="thebtn"
color="#D61820"
shape="circle"
@click.native.stop="getTree()"
v-if="item.actType == 19">{{ '种植' }}</u-button>
<view class="right_title1" v-if="item.actType == 22&& item.actStatus == 1&&item.point"> 积分:{{ item.point }}</view>
/>
</view>
</view>
<view class="actStatus colo" v-show="item.actStatus == 0">{{ item.actStatusVal }}</view>
<view class="actStatus colo1" v-show="item.actStatus == 1">{{ item.actStatusVal }}</view>
<view class="actStatus colo2" v-show="item.actStatus == 2">{{ item.actStatusVal }}</view>
<view class="actStatus colo" v-show="item.actStatus == 0">{{
item.actStatusVal
}}</view>
<view class="actStatus colo1" v-show="item.actStatus == 1">{{
item.actStatusVal
}}</view>
<view class="actStatus colo2" v-show="item.actStatus == 2">{{
item.actStatusVal
}}</view>
</view>
<getTree ref="tree"></getTree>
<!-- <getTree ref="tree"></getTree> -->
<giftDrwal ref="giftDrwal"></giftDrwal>
<newGift ref="newGift"></newGift>
<!-- <newGift ref="newGiftPay"></newGift> -->
</view>
</template>
<script>
import giftDrwal from '@/components/giftDrwal/index.vue'
import * as act from '@/config/activity.js'
import getTree from "@/components/getTree.vue";
import newGift from "@/components/newGift.vue";
// import getTree from "@/components/getTree.vue";
export default {
components: {
giftDrwal,
getTree,
newGift
// getTree,
},
data() {
return {
@ -65,20 +61,20 @@ export default {
this.getSearch()
},
methods: {
getTree(){
this.$refs.tree.getData(1)
},
// getTree(){
// this.$refs.tree.getData(1)
// },
goDetail(item) {
uni.navigateTo({
url: '/pages/market/activeArea/activeDetail?pkId=' + item.pkId,
})
},
getSearch() {
act.getActivityList().then((res) => {
act.getActivityList().then(res => {
this.dataList = res.rows
this.dataList.forEach((item) => {
this.dataList.forEach(item => {
if (item.actType == 22 && item.actStatus == 1) {
act.tourismPoint(item.pkId).then((res) => {
act.tourismPoint(item.pkId).then(res => {
if (res.data != undefined) {
this.$set(item, 'point', res.data)
}
@ -88,13 +84,7 @@ export default {
})
},
getGift(item) {
if (item.actType == 16) {
// 新人礼包;
this.$refs.newGift.getGiftList(item.pkId);
} else if (item.actType == 17) {
//抽奖
this.$refs.giftDrwal.getGiftList(item.pkId)
}
},
},
}
@ -112,23 +102,23 @@ export default {
margin-top: 27rpx;
display: flex;
position: relative;
.actStatus{
.actStatus {
position: absolute;
padding:10rpx 20rpx;
color:#fff;
padding: 10rpx 20rpx;
color: #fff;
border-radius: 0 20px 20px 0;
top: 48rpx;
font-size: 12px;
}
.colo{
background: #6382FB;
.colo {
background: #6382fb;
}
.colo1{
background: #FFA50E;
.colo1 {
background: #ffa50e;
}
.colo2{
background: #BFBFBF;
.colo2 {
background: #bfbfbf;
}
.actCover {

15
pages/mine/order/index.vue
View File

@ -413,27 +413,12 @@ export default {
}
api.payCheck(item.orderCode).then((res) => {
if (res.code == 200) {
if (item.orderType == 3 || item.orderType == 22) {
reg.checkPay(checkObj).then((response) => {
if (res.code == 200) {
uni.navigateTo({
url:
'/pages/pay/index?paramsPost=' +
JSON.stringify(item) +
'&businessType=1' +
'&onlinePay=' +
response.data,
})
}
})
} else {
uni.navigateTo({
url:
'/pages/pay/index?paramsPost=' +
JSON.stringify(item) +
'&businessType=1',
})
}
} else {
uni.showToast({
title: res.msg,

1116
pages/other/index.vue
View File

File diff suppressed because it is too large Load Diff

968
pages/other/newGiftPay.vue
View File

@ -1,968 +0,0 @@
<!--
* @Descripttion:
* @version:
* @Author: kBank
* @Date: 2022-11-21 15:11:22
-->
<template>
<view class="content">
<view class="context">
<u-form :model="form"
labelWidth="75"
:rules="rules"
ref="uForm">
<view class="subTxt" v-if="isDeliveryWay">
<view class="subTxt1">{{'收货人信息'}}</view>
<!-- <span class="subTxt2"
@click="addAdress">
<u-icon color="#fb3024"
name="plus-circle-fill"></u-icon>
<view>{{'添加'}}</view>
</span> -->
</view>
<view v-if="isDeliveryWay">
<u-form-item :label="'收货人'"
borderBottom
prop="recName">
<u-input v-model="form.recName"
border="none"
:placeholder="'请输入收货人'" />
</u-form-item>
<u-form-item :label="'收货电话'"
borderBottom
prop="recPhone">
<u-input v-model="form.recPhone" maxlength="20"
border="none"
type="number"
:placeholder="'请输入收货电话'" />
</u-form-item>
<u-form-item :label="'收货地址'"
borderBottom
prop="diqu"
@click='getDiqu'>
<view class="disFlex justBwn">
<u-input v-model="form.diqu"
:placeholder="'请选收货地址'"
border="none"></u-input>
<u-icon name="arrow-right"></u-icon>
</view>
</u-form-item>
<u-form-item :label="'详细地址'"
borderBottom
prop="recAddress">
<u-input v-model="form.recAddress"
border="none"
maxlength="200"
:placeholder="'请输入详细地址'" />
</u-form-item>
<u-form-item :label="'邮费'"
borderBottom>
<u-input disabled
border="none"
v-model="form.postage" />
</u-form-item>
<u-form-item :label="'备注'"
borderBottom>
<u-input v-model="form.remark"
border="none"
:placeholder="'请输入备注'" />
</u-form-item>
</view>
</u-form>
<view class="heng">
</view>
<!-- <view class="subTxt" v-show="isDeliveryWay">
<view>{{'历史地址'}}</view>
</view> -->
<view v-for="(item, index) in allDataObj.pgpList"
:key="index"
class="goodList">
<view class="goodList_i">
<view class="goodList_it">
<img :src="item.cover"
class="cover"
alt="">
<view class="goodList_ir">
<view class="goodList_ib">
<view class="tit1">
{{ item.productName }}
</view>
<view class="tit5">
x{{ item.quantity }}
</view>
</view>
<view class="goodList_ib">
<view class="tit5">
{{ item.specsName}}
</view>
</view>
</view>
</view>
<!-- <view v-for="(stem,sndex) in item.waresItemsParamList"
:key="sndex"
class="product_i">
<img :src="stem.specCover"
alt="">
<view class="product_il">
<view class="tit4">{{ stem.productName }} {{ stem.skuInfo }}</view>
<view class="tit5">x{{ stem.quantity }}</view>
</view>
</view> -->
<!-- <view class="fen">
<view class="disFlex justBwn">
<view class="tit3">{{'商品业绩'}}(PV)</view>
<view class="tit1">{{ item.achieveAmount | numberToCurrency}}</view>
</view>
<view class="disFlex justBwn">
<view class="tit3">{{'金额小计'}}</view>
<view class="tit1">{{ item.priceAmount | numberToCurrency}}</view>
</view>
</view> -->
</view>
</view>
<view class="pad">
<!-- <view class="disFlex justBwn">
<view class="tit3">{{'商品金额总计'}}(¥)：</view>
<view class="tit1">{{ allGoodsData.priceAmount | numberToCurrency | isLocal}}</view>
</view>
<view class="disFlex justBwn">
<view class="tit3">{{'邮费'}}：</view>
<view class="tit1">{{ form.postPrice | numberToCurrency | isLocal}}</view>
</view> -->
<view class="disFlex justBwn">
<view class="tit3">{{'总价'}}：</view>
<view class="tit1">{{ allDataObj.price | numberToCurrency | isLocal}}</view>
</view>
<!-- <view class="disFlex justBwn">
<view class="tit3">{{'业绩'}}</view>
<view class="tit1">{{ allGoodsData.achieveAmount | numberToCurrency }}</view>
</view>
<view class="disFlex justBwn"
v-if="specialArea==13">
<view class="tit3">BV</view>
<view class="tit1">{{ allGoodsData.assAchieveAmount | numberToCurrency }}</view>
</view> -->
</view>
</view>
<!-- 占空 -->
<view style="height:296rpx"></view>
<!-- 底部 -->
<view class="footer_f">
<view class="footer">
<!-- <view class="footer_l">
<u-checkbox-group v-model="agreementShow"
shape="circle"
activeColor="#FB3024"
@change="checkboxChange">
<u-checkbox :name="1">
</u-checkbox>
</u-checkbox-group>
<view class="tit3">{{'请阅读并同意'}}</view>
<view class="tit2"
@click="toAgree"> 《{{'购买协议'}}》</view>
</view> -->
<view class="footer_r">
<u-button type="success"
class="uBtn"
shape="circle"
:loading="isLoading"
:loadingText="'购买中'"
@tap="goBuy"
color="linear-gradient(to right, #fb3024, #fb3024 )">{{'购买'}}</u-button>
</view>
</view>
</view>
<!-- 发货方式 -->
<u-picker :show="isDelivery"
@cancel='isDelivery=false'
@confirm="sureDelivery"
:columns="deliList"
keyName="label"></u-picker>
<!-- 运输方式 -->
<u-picker :show="isTrans"
@cancel='isTrans=false'
@confirm="sureTrans"
:columns="transList"
keyName="label"></u-picker>
<!-- 发货仓库 -->
<u-picker :show="isCk"
@cancel='isCk=false'
@confirm="sureCk"
:columns="storehouseList"
keyName="label"></u-picker>
<!-- 所属店铺 -->
<u-picker :show="isDp"
@cancel='isDp=false'
@confirm="sureDp"
:columns="storeList"
keyName="label"></u-picker>
<!-- 强制阅读协议 -->
<mustAgreeMent :waresCodeList='waresCodeList'></mustAgreeMent>
<agreement ref="agreement"></agreement>
<u-modal :show="delAddress"
showConfirmButton
showCancelButton
:content="'确定要删除该收货地址吗'+'？'"
confirmColor='#DE3932'
@confirm="toDel"
@cancel="delAddress=false"
ref="uModal"
:asyncClose="true"></u-modal>
<v-address ref="address"
:defaultCode="defaultCode"
@addressData="addressData"></v-address>
</view>
</template>
<script>
import address from '@/components/address.vue'
import * as api from '@/config/regiest'
import mustAgreeMent from '@/components/mustAgreeMent.vue'
import agreement from '@/components/agreement.vue'
export default {
components: {
'v-address': address,
mustAgreeMent,
agreement,
},
data() {
return {
isDeliveryWay:true,
isDp: false,
storeList: [],
storehouseList: [],
isCk: false,
strTitle: '',
delAddress: false,
waresCodeList: [],
defaultCode: [],
moren: '',
addressList: [],
deliList: [],
transList: [],
bankList: [],
isDelivery: false,
isBank: false,
isTrans: false,
placeList: [
[
{
id: 1,
label: '安置左区',
},
{
id: 2,
label: '安置右区',
},
],
],
isPlace: false,
countryIndex: 0,
isCountry: false,
userInfo: '',
countryList: [],
isClick: 0,
specialArea: '',
shoppingArr: [],
allGoodsData: '',
pageList: {
mail: false,
card: false,
bankName: false,
bankNo: false,
accountBranch: false,
},
form: {
deliveryName: '快递发货',
deliveryWay: 1,
postage: 0,
transType: 1,
pkGradeVal: '',
},
deliList: [],
diqu: '',
allData: [],
goodsNum: 1,
agreementShow: [],
priceAmount: 0, //商品总价
achiveAmount: 0, //总业绩
totalAmont: 0,
orderItemsParams: [],
isLoading: false,
centerCodeId: '',
rules: {
upgradeMemberCode: [
{
required: true,
validator: this.upgradeMemberCodePass,
trigger: ['blur'],
},
],
recName: [
{
required: true,
message: '请输入收货人',
trigger: ['change', 'blur'],
},
],
recPhone: [
{
required: true,
message: '请输入收货电话',
trigger: ['change', 'blur'],
},
],
diqu: [
{
required: true,
message: '请选择收货地址',
trigger: ['change', 'blur'],
},
],
recAddress: [
{
required: true,
message: '请输入详细地址',
trigger: ['change', 'blur'],
},
],
transTypeLabel: [
{ validator: this.transPass, trigger: ['change'] },
],
deliveryWayLabel: [{
required: true,
message: '请选择发货方式',
trigger: ['change'],
}, ],
},
delId: '',
isSpace:false,
allDataObj:{},
allGoodsData: {},
}
},
onLoad(options) {
this.specialArea =9
// this.shoppingArr = JSON.parse(options.shoppArr)
this.allDataObj = JSON.parse(this.$route.query.data)
this.allGoodsData.pkNewPeople = this.allDataObj.pkNewPeople
// 获取购物车详情
// this.getCatDetail()
// 获取页面权限
// this.getPageList()
// 幂等性
this.getGenerate()
// 登录信息
this.userInfo = uni.getStorageSync('User')
// this.form.upgradeMemberCode = this.userInfo.memberCode
// this.getUserName()
},
onShow() {
// 获取地址
this.getAddressList()
},
methods: {
toAgree() {
// agreeMent
this.$refs.agreement.openDig()
},
getMember() {
let deleteList = []
this.shoppingArr.forEach((item) => {
deleteList.push({
shoppingId: item,
})
})
this.allGoodsData.deleteList = deleteList
this.allGoodsData.upgradeMemberCode = this.form.upgradeMemberCode
api.memLevel(this.allGoodsData).then((res) => {
if (res.data.isEnough) {
this.form.pkGradeVal = res.data.pkGradeVal
} else {
this.isLoading.close()
}
})
},
addAdress() {
uni.navigateTo({
url: '/pages/address/index',
})
},
editAddress(item) {
uni.navigateTo({
url: '/pages/address/index?pkId=' + item.pkId,
})
},
delAds(id) {
this.delId = id
this.delAddress = true
},
toDel() {
api.delAddress(this.delId).then((res) => {
uni.showToast({
title: '删除成功',
icon: 'none',
})
this.getAddressList()
})
this.delAddress = false
},
getPageList() {
api.registerList().then((res) => {
res.data.forEach((item) => {
if (item.field == 'MAILBOX') {
this.pageList.mail = true
} else if (item.field == 'CREDENTIALS') {
this.pageList.card = true
} else if (item.field == 'BANK_NAME') {
this.pageList.bankName = true
} else if (item.field == 'BANK_NO') {
this.pageList.bankNo = true
} else if (item.field == 'Account_Branch') {
this.pageList.accountBranch = true
}
})
})
},
getCatDetail() {
api
.shoppingWaresDetail({
shoppingIds: this.shoppingArr,
specialArea: this.specialArea,
})
.then((res) => {
this.allGoodsData = res.data
this.waresCodeList = res.data.orderItemsParams.map((item) => {
return item.waresCode
})
this.allGoodsData.specialArea = this.specialArea
this.totalAmont = this.allGoodsData.priceAmount
// 获取运输方式
this.getTransList()
// 获取发货方式
this.getDeliveryList()
if (this.specialArea == 2) {
this.getMember()
}
if (this.userInfo.pkSettleCountry != 1) {
//获取会员店铺
this.getStoreList()
//获取仓库
this.getStorehouseList()
}
})
},
transPass(rule, value, callback) {
if (this.isDeliveryWay) {
if (!value) {
callback(new Error('请选择运输方式'))
} else {
callback()
}
} else {
callback()
}
},
checkAddress() {},
// 升级编号获取name
upgradeMemberCodePass(rule, value, callback) {
if (!value) {
callback(new Error('请输入会员编号'))
} else {
api
.upgRel({
upgradeMemberCode: value,
})
.then((res) => {
if (res.code == 200) {
this.form.upgradeMemberName = res.data.upgradeMemberName
if (this.specialArea == 2) {
this.getMember()
}
this.$forceUpdate()
callback()
} else {
callback(new Error(res.msg))
}
})
.catch((err) => {
callback(new Error(err))
})
}
},
getStorehouseList() {
api.storehouseList().then((res) => {
let data = res.rows.map((item) => {
return {
id: item.pkId,
label: item.name,
}
})
this.storehouseList = [data]
})
},
getStoreList() {
api.storeList().then((res) => {
let data = res.rows.map((item) => {
return {
id: item.pkId,
label: item.storeName,
}
})
this.storeList = [data]
})
},
sureCk(e) {
const { value } = e
this.form.pkStorehouse = value[0].id
this.form.pkStorehouseLabel = value[0].label
this.isCk = false
},
sureDp(e) {
const { value } = e
this.form.pkMemberStore = value[0].id
this.form.pkMemberStoreLabel = value[0].label
this.isDp = false
},
getAddressList() {
api.addressList().then((res) => {
this.addressList = res.data
this.addressList.forEach((item) => {
if (item.isDefault == 1) {
this.moren = item.pkId
this.checkRadio()
}
})
})
},
getUserName() {
api
.upgRel({
upgradeMemberCode: this.form.upgradeMemberCode,
})
.then((res) => {
if (res.code == 200) {
this.form.upgradeMemberName = res.data.upgradeMemberName
this.$forceUpdate()
}
})
},
checkboxChange(e) {
console.log(
'%c [ e ]-749',
'font-size:13px; background:#384d26; color:#7c916a;',
e
)
},
checkRadio() {
let arr = []
this.addressList.forEach((item) => {
if (item.pkId == this.moren) {
this.form.recName = item.recName
this.form.nameList = item.recArea
this.form.recPhone = item.recPhone
this.form.recAddress = item.recAddress
this.form.recProvince = item.recProvince
this.form.recCity = item.recCity
if (item.recCounty) {
this.form.diqu = `${item.recProvinceVal}-${item.recCityVal}-${item.recCountyVal}`
this.form.recCounty = item.recCounty
} else {
this.form.diqu = `${item.recProvinceVal}-${item.recCityVal}`
this.form.recCounty = ''
}
this.defaultCode = [
item.recProvince,
item.recCity,
item.recCounty || '',
]
}
})
this.allGoodsData.deliveryWay = this.form.deliveryWay
this.allGoodsData.transType = this.form.transType
this.getPostAge()
this.$forceUpdate()
},
// getPostAge() {
// let deleteList = []
// this.shoppingArr.forEach((item) => {
// deleteList.push({
// shoppingId: item,
// })
// })
// this.allGoodsData.deleteList = deleteList
// api.queryPostage(this.allGoodsData).then((res) => {
// this.form.postage = res.data.postage
// this.totalAmont =
// parseFloat(this.allGoodsData.priceAmount) +
// parseFloat(res.data.postage)
// })
// },
getPostAge() {
this.allGoodsData.specialArea = 9
api.queryAdressPostage(this.allGoodsData).then((res) => {
this.form.postage = Number(res.data.postage).toFixed(2)
this.totalAmont =
parseFloat(this.allGoodsData.priceAmount) +
parseFloat(res.data.postage)
})
},
getTransList() {
api.transportList().then((res) => {
let data = res.data.map((item) => {
return {
id: item.value,
label: item.label,
}
})
this.transList = [data]
if (this.userInfo.pkSettleCountry == 1) {
this.form.transType = 1
data.forEach((item) => {
if (item.id == 1) {
this.form.transTypeLabel = item.label
}
})
}
})
},
getDeliveryList() {
api.deliveryList().then((res) => {
let data = res.data.map((item) => {
return {
id: item.value,
label: item.label,
}
})
this.deliList = [data]
if (this.userInfo.pkSettleCountry == 1) {
this.form.deliveryWay = 1
data.forEach((item) => {
if (item.id == 1) {
this.form.deliveryWayLabel = item.label
}
})
}
})
},
sureTrans(e) {
const { value } = e
this.form.transType = value[0].id
this.form.transTypeLabel = value[0].label
this.isTrans = false
},
sureDelivery(e) {
const { value } = e
this.form.deliveryWay = value[0].id
this.form.deliveryWayLabel = value[0].label
if (value[0].id == 2 || value[0].id == 3) {
this.isDeliveryWay = false
} else {
this.isDeliveryWay = true
}
this.isDelivery = false
},
getGenerate() {
api.generate().then((res) => {
uni.setStorageSync('mToken', res.msg)
})
},
goBuy() {
this.$refs.uForm.validate().then((res) => {
this.isLoading = true
// url(
// Object.assign({}, this.form, this.allGoodsData, {
// deleteList: deleteList,
// })
// ).then((res) => {
// this.isLoading = false
// if (res.code == 200) {
// uni.navigateTo({
// url:
// '/pages/pay/index?paramsPost=' +
// JSON.stringify(res.data) +
// '&businessType=1',
// })
// }
// })
let obj = Object.assign({}, this.allGoodsData, this.form, {
specialArea: 9,
})
api
.confirmGiftOrder(obj)
.then((res) => {
this.isLoading = false
if (res.code == 200) {
// 下单成功，领取礼包
// this.getGifts()
uni.navigateTo({
url:
'/pages/pay/index?paramsPost=' +
JSON.stringify(res.data) +
'&businessType=1',
})
}
})
})
},
getDiqu() {
this.$refs.address.setShow()
},
confirmPopup() {},
addressData(diqu, obj) {
this.form.diqu = diqu
this.form.recProvince = obj.province
this.form.recCity = obj.city
this.form.recCounty = obj.county
this.$forceUpdate()
this.getPostAge()
// this.queryAdressPostage()
},
},
}
</script>
<style lang="scss" scoped>
.content {
.con_top {
width: 100%;
position: fixed;
display: flex;
background: #fb3024;
font-size: 28rpx;
font-weight: 400;
color: #ffffff;
padding: 24rpx 0;
z-index: 1;
.con_top_i {
flex: 1;
text-align: center;
.bai {
width: 52rpx;
height: 6rpx;
background: #ffffff;
margin: 0 auto;
margin-top: 10rpx;
}
}
}
.zhan {
height: 96rpx;
}
}
.countImg {
width: 62rpx;
height: 41rpx;
margin-right: 20rpx;
}
.context {
}
::v-deep .u-form-item__body {
padding: 10px 20px;
}
::v-deep .u-input__content {
padding: 0px 20rpx;
}
::v-deep .u-form-item__body__right__message {
margin-left: 105px !important;
}
.disFlex {
display: flex;
align-items: center;
}
.justBwn {
width: 100%;
justify-content: space-between;
}
.goodList {
display: flex;
padding: 20rpx;
border-bottom: 1px solid #eee;
}
.cover {
width: 136rpx;
height: 136rpx;
background: #ffffff;
border: 1px solid #eeeeee;
border-radius: 10rpx;
}
.goodList_i {
flex: 1;
}
.goodList_it {
display: flex;
padding: 0rpx 0 20rpx 0rpx;
.goodList_ir {
margin-left: 20rpx;
flex: 1;
display: flex;
flex-direction: column;
justify-content: space-between;
.goodList_ib {
display: flex;
align-items: center;
justify-content: space-between;
img {
width: 56rpx;
height: 56rpx;
}
}
}
}
.product_i {
display: flex;
align-items: center;
background: #F6F6F6;
padding: 28rpx;
.product_il {
display: flex;
align-items: center;
flex: 1;
justify-content: space-between;
margin-left: 20rpx;
}
img {
width: 50rpx;
height: 50rpx;
background: #ffffff;
border: 1px solid #dddddd;
border-radius: 10rpx;
}
}
.fen {
background: #F6F6F6;
padding: 0 28rpx 28rpx 28rpx;
}
.pad {
padding: 28rpx;
}
.footer_f {
position: fixed;
bottom: 0;
width: 100%;
z-index: 10;
background: #f2f2f2;
// height: 296rpx;
}
.footer {
display: flex;
flex-direction: column;
justify-content: space-between;
padding: 20rpx 24rpx 40rpx 20rpx;
.footer_l {
display: flex;
justify-content: center;
margin: 30rpx 0 40rpx 0;
}
.footer_r {
// flex: 1;
display: flex;
align-items: center;
font-size: 20rpx;
font-weight: 500;
color: #333333;
}
}
.tit1 {
font-size: 28rpx;
font-family: Source Han Sans CN;
font-weight: 400;
color: #333333;
}
.tit2 {
font-size: 26rpx;
font-family: Source Han Sans CN;
font-weight: bold;
color: #fb3024;
}
.tit3 {
font-size: 26rpx;
font-family: Source Han Sans CN;
font-weight: 400;
color: #999999;
}
.tit4 {
font-size: 28rpx;
font-family: PingFang SC;
font-weight: 400;
color: #333333;
}
.tit5 {
font-size: 24rpx;
font-family: Source Han Sans CN;
font-weight: 400;
color: #999999;
}
.heng {
height: 20rpx;
background: #f2f2f2;
}
.subTxt {
background: #fb3024;
font-size: 28rpx;
font-family: Source Han Sans CN;
font-weight: bold;
color: #fff;
padding: 35rpx 27rpx;
display: flex;
align-items: center;
justify-content: space-between;
.subTxt1 {
border-left: 4px solid #fff;
padding: 0 20rpx;
}
.subTxt2 {
display: flex;
align-items: center;
view {
margin-left: 20rpx;
}
}
}
.address_a {
padding: 27rpx;
border-bottom: 2rpx solid #eee;
}
.address_r {
flex: 1;
margin-left: 20rpx;
font-size: 28rpx;
font-family: Source Han Sans CN;
font-weight: bold;
color: #333333;
}
.address_rc {
margin: 6rpx 0;
}
.mr {
margin-left: 20rpx;
background: #181818;
border-radius: 16rpx;
font-size: 20rpx;
font-family: Source Han Sans CN;
font-weight: 400;
color: #ffffff;
padding: 6rpx 16rpx;
border-radius: 20px;
}
</style>