diff --git a/api/activity.js b/api/activity.js index 546bc14..b308093 100644 --- a/api/activity.js +++ b/api/activity.js @@ -261,4 +261,66 @@ export function spuTopList(data) { return request.get(`product/spu/get_hot_ranking`, data, { noAuth: true }); +} + +// 活动列表 +export function consumption(data) { + return request.get(`storeActivity/consumption`, data, { + noAuth: true + }); +} + +// 参加活动 +export function chooseConsumption(data) { + return request.post(`storeActivity/choose`, data); +} + +// 拉新补贴活动完成状态 +export function storeActivityStatus(data) { + return request.get(`storeActivity/status`, data); +} + +// 领取补贴 +export function storeActivityReceive(data) { + return request.post(`storeActivity/receive`, data); +} + +// 拉新补贴活动完成状态 +export function storeActivityRecord(data) { + return request.get(`storeActivity/record`, data); +} + +// 补贴余额统计 +export function storeActivityTotal(data) { + return request.get(`storeActivity/total`, data); +} + + +// 活动商品专区 +export function storeActivityProduct(data) { + return request.get(`storeActivity/product`, data, { + noAuth: true + }); +} + +// 活动区域列表 +export function storeActivityDistrict(data) { + return request.get(`storeActivity/district`, data); +} + +//邀请好友列表 +export function qrcode(data) { + return request.get(`qrcode`, data); +} + + +// 生成二维码 +export function merchantRecord(data) { + return request.get(`merchantRecord`, data); +} + + +// 生成二维码 +export function mer_services_agree() { + return request.get(`agreement/mer_services_agree`); } \ No newline at end of file diff --git a/api/store.js b/api/store.js index ac894e8..8226901 100644 --- a/api/store.js +++ b/api/store.js @@ -395,6 +395,14 @@ export function getHotBanner(type) { export function create(data) { return request.post("intention/create", data); } +/** + * 种养殖户入驻表单 + * @returns {*} + */ +export function personalStore(data) { + return request.post("intention/personal_store", data); +} + /** * 商户入驻短信验证码 * @returns {*} @@ -593,4 +601,35 @@ export function priceRuleApi(id) { return request.get(`store/product/price_rule/${id}`, {}, { noAuth: true }); +} + +export function vicinityStoreApi(data) { + return request.get(`region/${data}/merchant`); +} + +/* + 商家入驻 -- 获取商户入驻申请协议内容 +*/ +export function agreeiness(data) { + return request.get(`business/agree`, data, { + noAuth: true + }); +} + +/* + 上传图片识别文字 +*/ +export function merchantLicenseIdentify(data) { + return request.post(`merchant_license_identify`, data, { + noAuth: true + }); +} + +/* + 从供销平台获取村店铺负责人,联系电话 +*/ +export function getVillageInfo(data) { + return requestb.get(`shop_call/getVillageCompany`, data, { + noAuth: true + }); } \ No newline at end of file diff --git a/manifest.json b/manifest.json index 1d8799f..44b9765 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name" : "惠农生活", "appid" : "__UNI__3A527D1", "description" : "", - "versionName" : "1.0.4", - "versionCode" : 127, + "versionName" : "2.0.0", + "versionCode" : 200, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { diff --git a/pages/gather/gather.vue b/pages/gather/gather.vue index c68ef60..371116d 100644 --- a/pages/gather/gather.vue +++ b/pages/gather/gather.vue @@ -98,15 +98,15 @@ onLoad() { }, onShow() { - // if (this.isLogin) { - // this.emptyText = '暂无可用应用' - // this.jurisdiction = false - // this.initAllAppLet(); - // } else { - // this.emptyText = '请登录' - // this.jurisdiction = true - // } - // this.getUserInfo(); + if (this.isLogin) { + this.emptyText = '暂无可用应用' + this.jurisdiction = false + this.initAllAppLet(); + } else { + this.emptyText = '请登录' + this.jurisdiction = true + } + this.getUserInfo(); }, onPullDownRefresh() { this.getUserInfo() @@ -304,7 +304,6 @@ if (!res.data.mer_info) { that.$set(this, 'jurisdiction', false); } - // console.log(that.userInfoData); }); }, } diff --git a/pages/index/component/card.vue b/pages/index/component/card.vue new file mode 100644 index 0000000..943d71b --- /dev/null +++ b/pages/index/component/card.vue @@ -0,0 +1,61 @@ + + + + + diff --git a/pages/index/component/homeComb.vue b/pages/index/component/homeComb.vue index c9534f0..77eb49a 100644 --- a/pages/index/component/homeComb.vue +++ b/pages/index/component/homeComb.vue @@ -5,6 +5,23 @@ + + + + + + {{street||'定位中' }} + + + + + + + + + + + @@ -35,10 +52,10 @@ 搜索商品 - + @@ -48,10 +65,10 @@ - + - + @@ -78,8 +95,8 @@ - - + + @@ -97,6 +114,7 @@ + + + @@ -281,6 +283,7 @@ import { getProductslist, getProductHot, storeCategory } from '@/api/store.js'; import { initiateAssistApi } from '@/api/activity.js'; import { setVisit, spread } from '@/api/user.js'; import recommend from '@/components/recommend'; +import card from './component/card'; // #ifndef H5 import passwordPopup from '@/components/passwordPopup'; // #endif @@ -327,6 +330,7 @@ export default { components: { easyLoadimage, recommend, + card, customTab, // #ifndef H5 passwordPopup, @@ -1722,4 +1726,6 @@ page { font-size: 24rpx; } } + + diff --git a/pages/store/home/index.vue b/pages/store/home/index.vue index 4c4e039..ceb0198 100644 --- a/pages/store/home/index.vue +++ b/pages/store/home/index.vue @@ -571,6 +571,19 @@ value: 4, } ], + // 底部菜单 + tabs3: [ + { + icon: 'icon-gouwu_o', + name: '商品', + value: 3, + }, + { + icon: 'icon-yingyongAPP_o', + name: '分类', + value: 2, + } + ], tabs: [], storeScroll: true, storeTop: 0, diff --git a/pages/store/settled/index.vue b/pages/store/settled/index.vue index 986af2e..53f76a6 100644 --- a/pages/store/settled/index.vue +++ b/pages/store/settled/index.vue @@ -1,127 +1,310 @@