Skip to content

Commit 8f712ee

Browse files
gookinggooking
committed
1
1 parent 04c8b18 commit 8f712ee

File tree

148 files changed

+22036
-22503
lines changed

Some content is hidden

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

148 files changed

+22036
-22503
lines changed

‎App.vue‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
globalData: {
77
h5Domain: 'https://flpt.jxsupplier.com',
88
goLogin: false,
9-
subDomain: 'tz', // jdjf0115
10-
merchantId: '951', // 42151
9+
subDomain: 'bnhj', // jdjf0115
10+
merchantId: '88', // 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

‎components/goods-pop/goods-pop.vue‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
<u-popup v-if="show" :show="show" mode="bottom" round="32rpx" :customStyle="{maxHeight: '80vh', overflow: 'scroll'}"
33
@close="close">
44
<view class="goodsList-pop">
5-
<u--image showLoading lazyLoad :src="pic" radius="16rpx" width="240rpx" height="240rpx"></u--image>
5+
<u-image showLoading lazyLoad :src="pic" radius="16rpx" width="240rpx" height="240rpx"></u-image>
66
<view class="goods-info">
7-
<u--text class="t" :lines="3" :text="goodsDetail.basicInfo.name"></u--text>
7+
<u-text class="t" :lines="3" :text="goodsDetail.basicInfo.name"></u-text>
88
<view v-if="goodsDetail.basicInfo.numberSells" class="t2">已售:{{ goodsDetail.basicInfo.numberSells }}
99
</view>
1010
<view class="price">

‎node_modules/apifm-uniapp/index.js‎

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packageFx/apply/form.vue‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,18 @@
33
<image v-if="adPositionFxTopPic" class="logo" :src="adPositionFxTopPic.val" mode="widthFix" />
44

55
<u-divider text="申请成为分销商"></u-divider>
6-
<u--form ref="uForm" label-width="130rpx">
6+
<u-formref="uForm" label-width="130rpx">
77
<u-form-item v-if="userDetail && userDetail.referrer" label="邀请人">
8-
<u--input v-model="userDetail.referrer.nick" />
8+
<u-input v-model="userDetail.referrer.nick" />
99
</u-form-item>
1010
<u-form-item label="姓名">
11-
<u--input v-model="name" clearable required placeholder="请输入真实姓名"/>
11+
<u-input v-model="name" clearable required placeholder="请输入真实姓名"/>
1212
</u-form-item>
1313
<u-form-item label="手机">
14-
<u--input v-model="mobile" type="number" clearable required placeholder="请输入手机号码"/>
14+
<u-input v-model="mobile" type="number" clearable required placeholder="请输入手机号码"/>
1515
</u-form-item>
1616

17-
</u--form>
17+
</u-form
1818

1919

2020
<view class="tips">成为分销商后卖出商品，您可以获得佣金</view>

‎packageFx/index/index.vue‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<template>
22
<view>
33
<view>
4-
<image style="width:750rpx;height:486rpx" mode="aspectFit" src="../../static/images/index-top-bg.png" ></image>
4+
<image style="width:750rpx;height:486rpx" mode="aspectFit" src="https://dcdn.it120.cc/static/yidianan/index-top-bg.png" ></image>
55
</view>
66

77
<!-- 如果当前用户是分销商 -->
@@ -74,11 +74,11 @@
7474

7575
<u-cell-group title="分销信息" customStyle="padding: 0 24rpx;">
7676
<u-form-item label="我的邀请码" labelWidth="100">
77-
<u--input v-model="apiUserInfoMap.base.id" disabled clearable inputAlign="center" >
77+
<u-input v-model="apiUserInfoMap.base.id" disabled clearable inputAlign="center" >
7878
<template >
7979
<u-button slot="suffix" @tap="copyContent(apiUserInfoMap.base.id)" text="复制" type="success" size="mini"></u-button>
8080
</template>
81-
</u--input>
81+
</u-input>
8282
</u-form-item>
8383

8484
<u-cell title="我的团队" value="查看" isLink url="../myusers/index"></u-cell>

‎pages/address/addSite.vue‎

Lines changed: 48 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,27 @@
11
<template>
22
<view class="wrap">
33
<view class="top">
4-
<u--form ref="uForm" label-width="130rpx" :model="form">
4+
<!-- #ifdef MP-WEIXIN || MP-ALIPAY || MP-BAIDU || MP-TOUTIAO -->
5+
<u-cell title="一键读取小程序收获地址" :isLink="true" @click="chooseAddress"></u-cell>
6+
<!-- #endif -->
7+
<u-formref="uForm" label-width="130rpx" :model="form">
58
<u-form-item label="收货人" prop="linkMan" required>
6-
<u--input v-model="form.linkMan" clearable placeholder="请输入收货人" />
9+
<u-input v-model="form.linkMan" clearable placeholder="请输入收货人" />
710
</u-form-item>
811
<u-form-item label="手机号码" prop="mobile" required>
9-
<u--input v-model="form.mobile" type="number" clearable placeholder="请输入手机号码" />
12+
<u-input v-model="form.mobile" type="number" clearable placeholder="请输入手机号码" />
1013
</u-form-item>
1114
<u-form-item label="所在地区" prop="areaDisplay" required>
1215
<u-cell style="width: 100%;" :title="form.areaDisplay ? form.areaDisplay : '省市区县、乡镇信息'" required clickable isLink :border="false" @click="showRegion = true"></u-cell>
1316
<city-select v-model="showRegion" :area-code="areaCode" :level="4" @city-change="cityChange"></city-select>
1417
</u-form-item>
1518
<u-form-item label="详细地址" label-position="top" prop="address" required>
16-
<u--input v-model="form.address" type="textarea" :auto-height="true" clearable placeholder="请输入详细地址" />
19+
<u-input v-model="form.address" type="textarea" :auto-height="true" clearable placeholder="请输入详细地址" />
1720
</u-form-item>
1821
<u-form-item label="默认地址">
1922
<u-switch v-model="form.isDefault" active-color="#19be6b" slot="right"></u-switch>
2023
</u-form-item>
21-
</u--form>
24+
</u-form
2225
</view>
2326
<view class="submit">
2427
<u-button type="success" @click="submit">保存</u-button>
@@ -139,6 +142,46 @@ export default {
139142
uni.navigateBack()
140143
}
141144
},
145+
chooseAddress() {
146+
uni.chooseAddress({
147+
success: res => {
148+
this._chooseAddress(res)
149+
}
150+
})
151+
},
152+
async _chooseAddress(chooseAddressRes) {
153+
this.form.address = chooseAddressRes.detailInfo
154+
this.form.linkMan = chooseAddressRes.userName
155+
this.form.mobile = chooseAddressRes.telNumber
156+
this.form.areaDisplay = chooseAddressRes.provinceName + chooseAddressRes.cityName + chooseAddressRes.countyName
157+
// 读取省份
158+
let res = await this.$wxapi.province()
159+
if(res.code != 0) {
160+
return
161+
}
162+
let item = res.data.find(ele => { return ele.name == chooseAddressRes.provinceName })
163+
if(item) {
164+
this.form.provinceId = item.id
165+
}
166+
// 读取城市
167+
res = await this.$wxapi.nextRegion(item.id)
168+
if(res.code != 0) {
169+
return
170+
}
171+
item = res.data.find(ele => { return ele.name == chooseAddressRes.cityName })
172+
if(item) {
173+
this.form.cityId = item.id
174+
}
175+
// 读取区县
176+
res = await this.$wxapi.nextRegion(item.id)
177+
if(res.code != 0) {
178+
return
179+
}
180+
item = res.data.find(ele => { return ele.name == chooseAddressRes.countyName })
181+
if(item) {
182+
this.form.districtId = item.id
183+
}
184+
}
142185
}
143186
};
144187
</script>

‎pages/asset/bindCard.vue‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
11
<template>
22
<view v-if="!userBankInfo && userBankInfoOk">
33
<view class="form-box">
4-
<u--form ref="uForm" label-width="130rpx" :model="form">
4+
<u-formref="uForm" label-width="130rpx" :model="form">
55
<u-form-item label="银行名称" prop="bankName" required>
66
<picker class="input-select" mode="selector" v-model="userBankSelectBanksIndex" :range="userBankSelectBanks" range-key="bankName" @change="userBankSelectBanksChange">
77
<view @click="userBankSelectBanksShow = true">
8-
<u--input v-model="form.bankName" readonly placeholder="请选择开户银行" suffixIcon="arrow-right"></u--input>
8+
<u-input v-model="form.bankName" readonly placeholder="请选择开户银行" suffixIcon="arrow-right"></u-input>
99
</view>
1010
</picker>
1111
</u-form-item>
1212
<u-form-item label="所在地区" prop="areaDisplay" required>
1313
<view class="input-select" @click="showRegion = true">
14-
<u--input v-model="form.areaDisplay" readonly placeholder="请选择省市区县、乡镇信息" suffixIcon="arrow-right"></u--input>
14+
<u-input v-model="form.areaDisplay" readonly placeholder="请选择省市区县、乡镇信息" suffixIcon="arrow-right"></u-input>
1515
</view>
1616
<city-select v-model="showRegion" :area-code="areaCode" :level="4" @city-change="cityChange"></city-select>
1717
</u-form-item>
1818
<u-form-item label="开户行" prop="bankBranch" required>
19-
<u--input v-model="form.bankBranch" clearable placeholder="请输入开户支行名称"></u--input>
19+
<u-input v-model="form.bankBranch" clearable placeholder="请输入开户支行名称"></u-input>
2020
</u-form-item>
2121
<u-form-item label="姓名" prop="name" required>
22-
<u--input v-model="form.name" clearable placeholder="请输入银行开户姓名"></u--input>
22+
<u-input v-model="form.name" clearable placeholder="请输入银行开户姓名"></u-input>
2323
</u-form-item>
2424
<u-form-item label="银行账号" prop="bankCardNumber" required>
25-
<u--input v-model="form.bankCardNumber" type="number" clearable placeholder="请输入银行账号"></u--input>
25+
<u-input v-model="form.bankCardNumber" type="number" clearable placeholder="请输入银行账号"></u-input>
2626
</u-form-item>
27-
</u--form>
27+
</u-form
2828
</view>
2929
<view class="submit-btn">
3030
<u-button type="success" @click="submit">立即绑定</u-button>
@@ -35,10 +35,10 @@
3535
<u-cell title="开户银行" :value="userBankInfo.info.bankName"></u-cell>
3636
<u-cell title="支行" :value="userBankInfo.info.bankBranch"></u-cell>
3737
<u-cell title="姓名">
38-
<u--text slot="value" mode="name" :text="userBankInfo.info.name" format="encrypt" align="right"></u--text>
38+
<u-text slot="value" mode="name" :text="userBankInfo.info.name" format="encrypt" align="right"></u-text>
3939
</u-cell>
4040
<u-cell title="账号">
41-
<u--text slot="value" mode="name" :text="userBankInfo.info.bankCardNumber" format="encrypt" align="right"></u--text>
41+
<u-text slot="value" mode="name" :text="userBankInfo.info.bankCardNumber" format="encrypt" align="right"></u-text>
4242
</u-cell>
4343
<view class="submit-btn">
4444
<u-button type="error" @click="userBankUnBind">解除绑定</u-button>

‎pages/asset/recharge.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</u-grid-item>
88
</u-grid>
99
<view class="submit-btn">
10-
<u--input placeholder="请输入充值金额" v-model="amount" type="digit" fontSize="38rpx" clearable></u--input>
10+
<u-input placeholder="请输入充值金额" v-model="amount" type="digit" fontSize="38rpx" clearable></u-input>
1111
</view>
1212
<view class="submit-btn">
1313
<u-button type="success" @click="submit">立即充值</u-button>

‎pages/asset/widthdraw.vue‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<template>
22
<view>
33
<view class="form-box">
4-
<u--form ref="uForm" label-width="130rpx" :model="form">
4+
<u-formref="uForm" label-width="130rpx" :model="form">
55
<u-form-item label="提现方式" prop="withdrawType" required>
66
<u-radio-group v-model="form.withdrawType" @change="radioChange">
77
<u-radio label="提现到微信" :name="0"></u-radio>
@@ -10,28 +10,28 @@
1010
</u-form-item>
1111
<template v-if="userBankInfo">
1212
<u-form-item label="所在地">
13-
<u--text mode="text" :text="userBankInfo.info.provinceStr + userBankInfo.info.cityStr + userBankInfo.info.areaStr + userBankInfo.info.streetStr" align="right"></u--text>
13+
<u-text mode="text" :text="userBankInfo.info.provinceStr + userBankInfo.info.cityStr + userBankInfo.info.areaStr + userBankInfo.info.streetStr" align="right"></u-text>
1414
</u-form-item>
1515
<u-form-item label="开户银行">
16-
<u--text mode="text" :text="userBankInfo.info.bankName" align="right"></u--text>
16+
<u-text mode="text" :text="userBankInfo.info.bankName" align="right"></u-text>
1717
</u-form-item>
1818
<u-form-item label="支行">
19-
<u--text mode="text" :text="userBankInfo.info.bankBranch" align="right"></u--text>
19+
<u-text mode="text" :text="userBankInfo.info.bankBranch" align="right"></u-text>
2020
</u-form-item>
2121
<u-form-item label="姓名">
22-
<u--text mode="name" :text="userBankInfo.info.name" format="encrypt" align="right"></u--text>
22+
<u-text mode="name" :text="userBankInfo.info.name" format="encrypt" align="right"></u-text>
2323
</u-form-item>
2424
<u-form-item label="账号">
25-
<u--text mode="name" :text="userBankInfo.info.bankCardNumber" format="encrypt" align="right"></u--text>
25+
<u-text mode="name" :text="userBankInfo.info.bankCardNumber" format="encrypt" align="right"></u-text>
2626
</u-form-item>
2727
</template>
2828
<u-form-item label="可提金额">
29-
<u--text mode="price" :text="balance" align="right"></u--text>
29+
<u-text mode="price" :text="balance" align="right"></u-text>
3030
</u-form-item>
3131
<u-form-item label="提现金额" prop="amount" required>
32-
<u--input v-model="form.amount" type="digit" clearable placeholder="请输入提现金额"></u--input>
32+
<u-input v-model="form.amount" type="digit" clearable placeholder="请输入提现金额"></u-input>
3333
</u-form-item>
34-
</u--form>
34+
</u-form
3535
</view>
3636
<view class="submit-btn">
3737
<u-button type="success" @click="submit">申请提现</u-button>

‎pages/category/category.vue‎

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,17 @@
2626
@scrolltolower="goodsGoBottom">
2727
<u-empty v-if="!goodsList" mode="list" text="暂无商品" marginTop="200rpx" />
2828
<view v-for="(item, index) in goodsList" :key="index" class="goodsList">
29-
<u--image showLoading lazyLoad :src="item.pic" radius="16rpx" width="240rpx" height="240rpx"
30-
@click="goDetail(item)"></u--image>
29+
<u-image showLoading lazyLoad :src="item.pic" radius="16rpx" width="240rpx" height="240rpx"
30+
@click="goDetail(item)"></u-image>
3131
<view class="goods-info">
32-
<view class="goods-title u-line-3 pt16" @click="goDetail(item)">
33-
<u-tag v-if="item.supplyType == 'vop_jd' || item.supplyType == 'jdJoycityPoints'" text="京东自营" bgColor="#e64340" borderColor="#e64340" size="mini" class="goods-title-tag"></u-tag>
34-
<text class="goods-title">{{ item.name }}</text>
32+
<view class="goods-title u-line-3 pt16" @click="goDetail(item)">
33+
<u-tag v-if="item.supplyType == 'vop_jd' || item.supplyType == 'jdJoycityPoints'" text="京东自营" bgColor="#e64340" borderColor="#e64340" size="mini" class="goods-title-tag"></u-tag>
34+
<text class="goods-title">{{ item.name }}</text>
3535
</view>
3636
<view v-if="item.numberSells" class="t2">已售:{{ item.numberSells }}</view>
37-
<view class="price-score">
38-
<view v-if="item.minPrice" class="item"><text>¥</text>{{item.minPrice}}</view>
39-
<view v-if="item.minScore" class="item"><text><image class="score-icon" src="/static/images/score.png"></image></text>{{item.minScore}}</view>
37+
<view class="price-score">
38+
<view v-if="item.minPrice" class="item"><text>¥</text>{{item.minPrice}}</view>
39+
<view v-if="item.minScore" class="item"><text><image class="score-icon" src="/static/images/score.png"></image></text>{{item.minScore}}</view>
4040
</view>
4141
<view v-if="item.supplyType != 'jdJoycityPoints'" class="addCar">
4242
<u-icon v-if="item.propertyIds || item.hasAddition" name="plus-circle" color="#e64340"
@@ -192,12 +192,12 @@
192192
}
193193
},
194194
// 弹出商品购买弹窗
195-
async _showGoodsPop(item) {
196-
if(!await getApp().checkHasLoginedH5()) {
197-
uni.navigateTo({
198-
url: "/pages/login/login"
199-
})
200-
return
195+
async _showGoodsPop(item) {
196+
if(!await getApp().checkHasLoginedH5()) {
197+
uni.navigateTo({
198+
url: "/pages/login/login"
199+
})
200+
return
201201
}
202202
// https://www.yuque.com/apifm/nu0f75/vuml8a
203203
const res = await this.$wxapi.goodsDetail(item.id, this.token)
@@ -211,24 +211,24 @@
211211
this.goodsDetail = res.data
212212
this.showGoodsPop = true
213213
},
214-
async addCart(item) {
215-
if(!await getApp().checkHasLoginedH5()) {
216-
uni.navigateTo({
217-
url: "/pages/login/login"
218-
})
219-
return
220-
}
221-
let res
222-
if(item.supplyType == 'vop_jd') {
223-
// https://www.yuque.com/apifm/nu0f75/yum741
224-
res = await this.$wxapi.jdvopCartAdd({
225-
token: this.token,
226-
goodsId: item.yyId,
227-
number: 1
228-
})
229-
} else {
230-
// https://www.yuque.com/apifm/nu0f75/et6m6m
231-
res = await this.$wxapi.shippingCarInfoAddItem(this.token, item.id, 1, [], [])
214+
async addCart(item) {
215+
if(!await getApp().checkHasLoginedH5()) {
216+
uni.navigateTo({
217+
url: "/pages/login/login"
218+
})
219+
return
220+
}
221+
let res
222+
if(item.supplyType == 'vop_jd') {
223+
// https://www.yuque.com/apifm/nu0f75/yum741
224+
res = await this.$wxapi.jdvopCartAdd({
225+
token: this.token,
226+
goodsId: item.yyId,
227+
number: 1
228+
})
229+
} else {
230+
// https://www.yuque.com/apifm/nu0f75/et6m6m
231+
res = await this.$wxapi.shippingCarInfoAddItem(this.token, item.id, 1, [], [])
232232
}
233233
if (res.code != 0) {
234234
uni.showToast({
@@ -257,11 +257,11 @@
257257
})
258258
}
259259
})
260-
},
261-
goDetail(item) {
262-
uni.navigateTo({
263-
url: '/pages/goods/detail?id=' + item.id
264-
})
260+
},
261+
goDetail(item) {
262+
uni.navigateTo({
263+
url: '/pages/goods/detail?id=' + item.id
264+
})
265265
}
266266
}
267267
}
@@ -371,4 +371,4 @@
371371
}
372372
373373
}
374-
</style>
374+
</style>

0 commit comments

Comments
 (0)