Skip to content

Commit 4438a27

Browse files
gookinggooking
committed
增加押金功能
1 parent a94f511 commit 4438a27

File tree

91 files changed

+12994
-12652
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+12994
-12652
lines changed

‎App.vue

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,13 @@
66
globalData: {
77
h5Domain: 'https://flpt.jxsupplier.com',
88
goLogin: false,
9-
subDomain: 'cysx', // jdjf0115
10-
merchantId: 10, // 42151
9+
subDomain: 'tz', // jdjf0115
10+
merchantId: 951, // 42151
1111
version: '1.2.0',
1212
sysconfigkeys: 'mallName,shopMod,share_profile,recharge_amount_min,open_growth,shopping_cart_vop_open',
1313
wxpayOpenAppId: 'wx9b04553fd8c7b9c3', // 微信开放平台的移动端应用appID
1414
openAlipayProvider: false, // 是否开通支付宝支付
15+
addressLevel: 3, // 省市区到3级还是4级，可选 3 或者 4
1516
},
1617
onLaunch: function() {
1718
// https://www.yuque.com/apifm/nu0f75/cdqz1n

‎pages.json

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,19 @@
159159
"enablePullDownRefresh": true
160160
}
161161
},
162+
{
163+
"path" : "pages/asset/deposit",
164+
"style": {
165+
"navigationBarTitleText": "支付押金"
166+
}
167+
},
168+
{
169+
"path" : "pages/asset/depositlog",
170+
"style": {
171+
"navigationBarTitleText": "押金记录",
172+
"enablePullDownRefresh": true
173+
}
174+
},
162175
{
163176
"path" : "pages/score/index",
164177
"style": {

‎pages/address/addSite.vue

Lines changed: 16 additions & 116 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<template>
22
<view class="wrap">
3+
<!-- #ifdef MP-WEIXIN || MP-ALIPAY || MP-BAIDU || MP-TOUTIAO -->
4+
<u-cell title="一键读取小程序收获地址" :isLink="true" @click="chooseAddress"></u-cell>
5+
<!-- #endif -->
36
<view class="top">
4-
<!-- #ifdef MP-WEIXIN || MP-ALIPAY || MP-BAIDU || MP-TOUTIAO -->
5-
<u-cell title="一键读取小程序收获地址" :isLink="true" @click="chooseAddress"></u-cell>
6-
<!-- #endif -->
77
<u-form ref="uForm" label-width="130rpx" :model="form">
88
<u-form-item label="收货人" prop="linkMan" required>
99
<u-input v-model="form.linkMan" clearable placeholder="请输入收货人" />
@@ -13,7 +13,7 @@
1313
</u-form-item>
1414
<u-form-item label="所在地区" prop="areaDisplay" required>
1515
<u-cell style="width: 100%;" :title="form.areaDisplay ? form.areaDisplay : '省市区县、乡镇信息'" required clickable isLink :border="false" @click="showRegion = true"></u-cell>
16-
<city-select v-model="showRegion" :area-code="areaCode" :level="4" @city-change="cityChange"></city-select>
16+
<city-select v-model="showRegion" :area-code="areaCode" :level="addressLevel" @city-change="cityChange"></city-select>
1717
</u-form-item>
1818
<u-form-item label="详细地址" label-position="top" prop="address" required>
1919
<u-input v-model="form.address" type="textarea" :auto-height="true" clearable placeholder="请输入详细地址" />
@@ -23,7 +23,7 @@
2323
</u-form-item>
2424
</u-form>
2525
</view>
26-
<view class="submit">
26+
<view class="submit-btn">
2727
<u-button type="success" @click="submit">保存</u-button>
2828
</view>
2929
</view>
@@ -73,6 +73,7 @@ export default {
7373
isDefault: true,
7474
},
7575
areaCode: [], // 省市区的初始化，例如 ['123', '456', '789']
76+
addressLevel: 3
7677
};
7778
},
7879
onReady() {
@@ -82,6 +83,7 @@ export default {
8283
if(e.id) {
8384
this._addressDetail(e.id)
8485
}
86+
this.addressLevel = getApp().globalData.addressLevel * 1
8587
},
8688
mounted() {
8789
},
@@ -99,8 +101,12 @@ export default {
99101
this.form.provinceId = e.province.value
100102
this.form.cityId = e.city.value
101103
this.form.districtId = e.area.value
102-
this.form.streetId = e.street.value
103-
this.form.areaDisplay = e.province.label + e.city.label + e.area.label + e.street.label
104+
if (this.addressLevel == 4) {
105+
this.form.streetId = e.street.value
106+
this.form.areaDisplay = e.province.label + e.city.label + e.area.label + e.street.label
107+
} else {
108+
this.form.areaDisplay = e.province.label + e.city.label + e.area.label
109+
}
104110
},
105111
submit() {
106112
this.$refs.uForm.validate().then(res => {
@@ -181,120 +187,14 @@ export default {
181187
if(item) {
182188
this.form.districtId = item.id
183189
}
190+
this.$refs.uForm.validate()
184191
}
185192
}
186193
};
187194
</script>
188195

189196
<style lang="scss" scoped>
190-
/deep/ .line {
191-
color: $u-light-color;
192-
font-size: 28rpx;
193-
}
194-
.wrap {
195-
background-color: #f2f2f2;
196-
.top {
197-
background-color: #ffffff;
198-
border-top: solid 2rpx $u-border-color;
199-
padding: 22rpx;
200-
.item {
201-
display: flex;
202-
font-size: 32rpx;
203-
line-height: 100rpx;
204-
align-items: center;
205-
border-bottom: solid 2rpx $u-border-color;
206-
.left {
207-
width: 180rpx;
208-
}
209-
input {
210-
text-align: left;
211-
}
212-
}
213-
214-
.address {
215-
padding: 20rpx 0;
216-
textarea {
217-
// width: 100%;
218-
height: 150rpx;
219-
background-color: #f7f7f7;
220-
line-height: 60rpx;
221-
margin: 40rpx auto;
222-
padding: 20rpx;
223-
}
224-
}
225-
.site-clipboard {
226-
padding-right: 40rpx;
227-
textarea {
228-
// width: 100%;
229-
height: 150rpx;
230-
background-color: #f7f7f7;
231-
line-height: 60rpx;
232-
margin: 40rpx auto;
233-
padding: 20rpx;
234-
}
235-
.clipboard {
236-
display: flex;
237-
justify-content: center;
238-
align-items: center;
239-
font-size: 26rpx;
240-
color: $u-tips-color;
241-
height: 80rpx;
242-
.icon {
243-
margin-top: 6rpx;
244-
margin-left: 10rpx;
245-
}
246-
}
247-
}
248-
}
249-
.bottom {
250-
margin-top: 20rpx;
251-
padding: 40rpx;
252-
padding-right: 0;
253-
background-color: #ffffff;
254-
font-size: 28rpx;
255-
.tag {
256-
display: flex;
257-
.left {
258-
width: 160rpx;
259-
}
260-
.right {
261-
display: flex;
262-
flex-wrap: wrap;
263-
.tags {
264-
width: 140rpx;
265-
padding: 16rpx 8rpx;
266-
border: solid 2rpx $u-border-color;
267-
text-align: center;
268-
border-radius: 50rpx;
269-
margin: 0 10rpx 20rpx;
270-
display: flex;
271-
font-size: 28rpx;
272-
align-items: center;
273-
justify-content: center;
274-
color: $u-content-color;
275-
line-height: 1;
276-
}
277-
.plus {
278-
//padding: 10rpx 0;
279-
}
280-
}
281-
}
282-
.default {
283-
margin-top: 50rpx;
284-
display: flex;
285-
justify-content: space-between;
286-
border-bottom: solid 2rpx $u-border-color;
287-
line-height: 64rpx;
288-
.tips {
289-
font-size: 24rpx;
290-
}
291-
.right {
292-
}
293-
}
294-
}
295-
.submit {
296-
padding: 32rpx;
297-
background-color: #ffffff;
298-
}
197+
.top {
198+
padding: 0 32rpx;
299199
}
300200
</style>

‎pages/asset/balance.vue

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
<u-cell title="资金明细" isLink url="/pages/asset/cashlog"></u-cell>
2020
<u-cell title="我要提现" isLink url="/pages/asset/widthdraw"></u-cell>
2121
<u-cell title="提现记录" isLink url="/pages/asset/withdrawlog"></u-cell>
22+
<u-cell title="支付押金" isLink url="/pages/asset/deposit"></u-cell>
23+
<u-cell title="押金记录" isLink url="/pages/asset/depositlog"></u-cell>
2224
</view>
2325
</template>
2426

@@ -28,6 +30,7 @@
2830
return {
2931
balance: 0.00,
3032
freeze: 0.00,
33+
totleConsumed: 0.00,
3134
score: 0,
3235
score_sign_continuous: 0.00,
3336
tabs: [{

‎unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎unpackage/dist/dev/.sourcemap/mp-weixin/common/runtime.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎unpackage/dist/dev/.sourcemap/mp-weixin/components/goods-pop/goods-pop.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎unpackage/dist/dev/.sourcemap/mp-weixin/pages/category/category.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/start.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎unpackage/dist/dev/.sourcemap/mp-weixin/pages/notice/detail.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎unpackage/dist/dev/.sourcemap/mp-weixin/pages/notice/list.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)