diff --git a/api/category/index.js b/api/category/index.js
index 526ac93..33574a1 100644
--- a/api/category/index.js
+++ b/api/category/index.js
@@ -12,6 +12,6 @@ export function list(param) {
}
-export function shoplist() {
- return request.get(api.shoplist)
+export function shoplist(param) {
+ return request.get(api.shoplist, param)
}
\ No newline at end of file
diff --git a/api/shop/navCategory/index.js b/api/shop/navCategory/index.js
new file mode 100644
index 0000000..35395a9
--- /dev/null
+++ b/api/shop/navCategory/index.js
@@ -0,0 +1,17 @@
+import request from '@/utils/request'
+
+// api地址
+const api = {
+ list: 'shop.navCategory/list',
+ detail: 'shop.navCategory/detail',
+}
+
+// 页面数据
+export function list() {
+ return request.get(api.list)
+}
+
+// 页面数据
+export function detail(categoryId) {
+ return request.get(api.detail, {categoryId})
+}
diff --git a/components/page/diyComponents/navBar/index.vue b/components/page/diyComponents/navBar/index.vue
index fc17f41..f797b65 100644
--- a/components/page/diyComponents/navBar/index.vue
+++ b/components/page/diyComponents/navBar/index.vue
@@ -1,55 +1,64 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+ {{ item1.text }}
+
+
+
+
+
- -->
-
-
-
-
-
-
-
-
-
-
- {{ item1.text }}
-
-
-
-
-
-
-
-
+
\ No newline at end of file
diff --git a/components/page/index.vue b/components/page/index.vue
index fbcf0f6..df84e81 100644
--- a/components/page/index.vue
+++ b/components/page/index.vue
@@ -31,7 +31,8 @@
-
+
diff --git a/components/shortcut/index.vue b/components/shortcut/index.vue
index a707070..f1a8269 100644
--- a/components/shortcut/index.vue
+++ b/components/shortcut/index.vue
@@ -24,7 +24,7 @@
default: 20
},
bottom: {
- type: Number,
+ type: Number | String,
default: 100
}
},
diff --git a/pages.json b/pages.json
index 88cc35e..d52fb53 100644
--- a/pages.json
+++ b/pages.json
@@ -343,6 +343,13 @@
"navigationStyle": "custom"
}
},
+ {
+ "path": "pages/shop/list",
+ "style": {
+ "navigationBarTitleText": "门店列表",
+ "navigationStyle": "custom"
+ }
+ },
{
"path": "pages/dealer/index",
"style": {
diff --git a/pages/checkout/index.vue b/pages/checkout/index.vue
index 764c942..c0e435e 100644
--- a/pages/checkout/index.vue
+++ b/pages/checkout/index.vue
@@ -107,9 +107,11 @@
-
-
-
+
+
+
+
+
@@ -310,9 +312,8 @@
options: {},
// 配送方式
isShowTab: false,
- DeliveryTypeEnum,
curDelivery: null,
- contentHeight: 300,
+ contentHeight: 400,
// 自提信息
selectedShopId: 0, // 选择的门店ID
linkman: '', // 自提联系人
@@ -337,8 +338,6 @@
goodsList: [],
// 优惠券列表
couponList: [],
- // 是否存在收货地址
- existAddress: false,
// 默认收货地址
address: null,
// 是否存在收货地址
@@ -357,7 +356,7 @@
fwxydetail: '',
yszcdetail: '',
Articles: '',
- radiochecked: false
+ radiochecked: true
}
},
@@ -366,6 +365,8 @@
*/
onLoad(options) {
this.options = options
+ const {screenHeight} = uni.getSystemInfoSync()
+ this.contentHeight = screenHeight * 0.65;
// 注册全局事件订阅: 选择自提门店
uni.$on('syncSelectedId', selectedId => {
this.selectedShopId = selectedId
@@ -388,10 +389,6 @@
// 获取当前订单信息
this.getOrderData()
},
- mounted: function() {
- var systemInfo = graceJS.system();
- this.contentHeight = systemInfo.windowHeight * 0.65;
- },
methods: {
radioChange() {
this.radiochecked = !this.radiochecked
diff --git a/pages/goods/detail.vue b/pages/goods/detail.vue
index a517bb2..46e6bba 100644
--- a/pages/goods/detail.vue
+++ b/pages/goods/detail.vue
@@ -1,533 +1,574 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ￥{{ goods.goods_price_min }}
- ￥{{ goods.line_price_min }}
-
- 已售{{ goods.goods_sales }}件
-
-
- 未预约未核销随时退
-
-
- {{goods.goods_name}}{{goods.goods_name.length}}
-
-
-
-
-
-
- 适用门店
- 联系商家
-
-
-
-
-
-
-
- {{goods.shop.shop_name}}
- 营业时间
- {{goods.shop.shop_hours}}
-
-
-
-
-
- {{goods.shop.full_address}}
-
-
-
-
-
-
-
-
-
- 购买须知
-
-
-
-
- 抢购日期
- 即日 至 {{goods.become_time}}
-
-
- 使用日期
- 即日 至 {{goods.use_time}}
-
-
- 可用时间
- {{goods.times.name}}
-
-
- 使用方式
- {{goods.uses.name}}
-
-
-
- 使用说明
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 图文详情
-
-
-
- 吉媒集团客服微信号：{{store.wxh}}
-
- {{store.wxmc}}
- 工作时间：{{store.gzsj}}
- 更多订单详情咨询
- 可添加吉媒婚恋专属客服微信
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ￥{{ goods.goods_price_min }}
+
+ ￥{{ goods.line_price_min }}
+
+
+ 已售{{ goods.goods_sales }}件
+
+
+
+ 未预约未核销随时退
+
+
+ {{ goods.goods_name }}
+
+
+
+
+
+
+ 适用门店
+ 联系商家
+
+
+
+
+
+
+
+ {{ goods.shop.shop_name }}
+
+
+
+ 营业时间
+ {{ goods.shop.shop_hours }}
+
+
+
+
+
+
+ {{ goods.shop.full_address }}
+
+
+
+
+
+
+
+
+
+ 购买须知
+
+
+
+
+ 抢购日期
+ 即日 至 {{ goods.become_time }}
+
+
+ 使用日期
+ 即日 至 {{ goods.use_time }}
+
+
+ 可用时间
+ {{ goods.times.name }}
+
+
+ 使用方式
+ {{ goods.uses.name }}
+
+
+
+ 使用说明
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 图文详情
+
+
+
+
+ 吉媒集团客服微信号：{{ store.wxh }}
+
+ {{ store.wxmc }}
+ 工作时间：{{ store.gzsj }}
+ 更多订单详情咨询
+ 可添加吉媒婚恋专属客服微信
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/goods/list.vue b/pages/goods/list.vue
index 511dade..b07e530 100644
--- a/pages/goods/list.vue
+++ b/pages/goods/list.vue
@@ -32,7 +32,7 @@
-
+
{
this.childCategoryList = res.data.list
this.selectedCategoryList = this.childCategoryList.map(item => parseInt(item.category_id))
+ console.log(1)
resolve()
})
})
@@ -240,13 +242,16 @@ export default {
upCallback(page) {
const app = this
// 设置列表数据
- app.getGoodsList(page.num)
- .then(list => {
- const curPageLen = list.data.length
- const totalSize = list.data.total
- app.mescroll.endBySize(curPageLen, totalSize)
- })
- .catch(() => app.mescroll.endErr())
+ console.log(2)
+ if (this.selectedCategoryList.length > 0) {
+ app.getGoodsList(page.num)
+ .then(list => {
+ const curPageLen = list.data.length
+ const totalSize = list.data.total
+ app.mescroll.endBySize(curPageLen, totalSize)
+ })
+ .catch(() => app.mescroll.endErr())
+ }
},
// 设置默认列表显示方式
@@ -303,6 +308,9 @@ export default {
// 合并新数据
const newList = result.data.list
app.list.data = getMoreListData(newList, app.list, pageNo)
+ const curPageLen = newList.data.length
+ const totalSize = result.data.total
+ app.mescroll.endBySize(curPageLen, totalSize)
resolve(newList)
})
.catch(reject)
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 6c47691..4193326 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,73 +1,71 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{city}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{item.shop_name}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ city }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -82,7 +80,8 @@
-
+
@@ -129,17 +128,18 @@
- {{item.goods_name}}
+ {{ item.goods_name }}
已售{{ item.goods_sales }}件
- {{item.distance_unit}}
+ {{ item.distance_unit }}
@@ -156,7 +156,8 @@
mode="aspectFill">
-
+
@@ -202,17 +203,18 @@
- {{item.goods_name}}
+ {{ item.goods_name }}
已售{{ item.goods_sales }}件
- {{item.distance_unit}}
+ {{ item.distance_unit }}
@@ -221,826 +223,863 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 查看详情
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查看详情
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 我是商家，申请免费入驻互动平台
+
+
+
+
\ No newline at end of file
diff --git a/pages/order/detail.vue b/pages/order/detail.vue
index 44e9699..031a564 100644
--- a/pages/order/detail.vue
+++ b/pages/order/detail.vue
@@ -1,803 +1,864 @@
-
-
-
-
-
-
- 订单详情
-
-
-
-
-
-
-
- 待付款，还剩
-
-
-
-
-
- 待到店使用
- 请在 {{order.become_time}} (含)前到店消费
-
-
- 订单取消中
-
-
-
- 订单已取消
-
-
-
-
-
-
-
-
-
-
- {{order.goods[0].goods_name}}
-
-
-
- 下单时间：{{ order.create_time }}
-
-
- 数量：{{order.goods[0].total_num}}
-
-
- ￥{{ order.goods[0].is_user_grade ? order.goods[0].grade_goods_price : order.goods[0].goods_price }}
-
-
-
-
-
-
-
-
-
-
- 券码信息({{order.coupon.length}}张可用)
- {{order.become_time}} 23:59:59 到期
-
-
-
- 申请取消
- 取消申请中
-
- 已申请售后
-
- 申请退款
-
-
-
-
-
- 券码{{index+1}} · {{item.code}}
-
- {{item.clerk_id == 0 ? '待使用' : '已使用'}}
-
-
-
-
-
-
- 适用门店
- 联系商家
-
-
-
-
-
-
-
- {{order.extract_shop.shop_name}}
- 营业时间 {{order.extract_shop.shop_hours}}
-
-
-
- {{order.extract_shop.full_address}}
-
-
-
-
-
- 订单信息
-
-
-
- 实付金额￥{{ order.pay_price }}
-
-
- 手机号{{order.extract.phone}}
-
-
- 订单号{{ order.order_no }}
-
- 复制
-
-
- 下单时间{{ order.create_time }}
-
-
- 购买数量{{order.goods[0].total_num}}
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+ 订单详情
+
+
+
+
+
+
+
+
+
+
+ 待付款，还剩
+
+
+
+
+
+
+
+
+
+ 待到店使用
+
+ 请在 {{ order.become_time }} (含)前到店消费
+
+
+
+
+
+ 订单取消中
+
+
+
+
+
+
+
+ 订单已取消
+
+
+
+
+
+
+
+
+
+
+
+ {{ order.goods[0].goods_name }}
+
+
+
+
+
+ 下单时间：{{ order.create_time }}
+
+
+ 数量：{{ order.goods[0].total_num }}
+
+
+ ￥
+ {{
+ order.goods[0].is_user_grade ? order.goods[0].grade_goods_price : order.goods[0].goods_price
+ }}
+
+
+
+
+
+
+
+
+
+
+
+
+ 券码信息({{ order.coupon.length }}张可用)
+
+ {{ order.become_time }} 23:59:59 到期
+
+
+
+ 申请取消
+
+ 取消申请中
+
+ 已申请售后
+
+
+ 申请退款
+
+
+
+
+
+
+ 券码{{ index + 1 }}
+ ·
+ {{ item.code }}
+
+ {{ item.clerk_id == 0 ? '待使用' : '已使用' }}
+
+
+
+
+
+
+ 适用门店
+ 联系商家
+
+
+
+
+
+
+
+ {{ order.extract_shop.shop_name }}
+
+
+
+ 营业时间 {{ order.extract_shop.shop_hours }}
+
+
+
+
+
+ {{ order.extract_shop.full_address }}
+
+
+
+
+
+
+ 订单信息
+
+
+
+ 实付金额
+ ￥{{ order.pay_price }}
+
+
+ 手机号
+ {{ order.extract.phone }}
+
+
+ 订单号
+ {{ order.order_no }}
+
+ 复制
+
+
+
+ 下单时间
+ {{ order.create_time }}
+
+
+ 购买数量
+ {{ order.goods[0].total_num }}
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/order/extract/check.vue b/pages/order/extract/check.vue
index a91c88d..622d4c8 100644
--- a/pages/order/extract/check.vue
+++ b/pages/order/extract/check.vue
@@ -1,163 +1,197 @@
-
-
-
-
-
-
-
- 待付款，还剩
-
-
-
-
-
- 待到店使用
- 请在 {{order.become_time}} (含)前到店消费
-
-
-
-
-
-
-
-
-
- {{order.goods[0].goods_name}}
-
-
- 下单时间：{{ order.create_time }}
-
-
- 数量：{{order.goods[0].total_num}}
-
-
- ￥{{ order.goods[0].is_user_grade ? order.goods[0].grade_goods_price : order.goods[0].goods_price }}
-
-
-
-
-
-
-
- 券码信息({{order.coupon.length}}张可用)
- {{order.become_time}} 23:59:59 到期
-
-
-
-
-
- 券码{{index+1}} · {{item.code}}
-
- {{item.clerk_id == 0 ? '待使用' : '已使用'}}
-
- 核销
-
-
-
-
-
-
-
- 适用门店
- 联系商家
-
-
-
-
-
-
-
- {{order.extract_shop.shop_name}}
- 营业时间 {{order.extract_shop.shop_hours}}
-
-
-
- {{order.extract_shop.full_address}}
-
-
-
-
-
- 订单信息
-
-
-
- 实付金额￥{{ order.pay_price }}
-
-
- 手机号{{order.extract.phone}}
-
-
- 订单号{{ order.order_no }}
-
- 复制
-
-
- 下单时间{{ order.create_time }}
-
-
- 购买数量{{order.goods[0].total_num}}
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+ 待付款，还剩
+
+
+
+
+
+
+
+
+
+ 待到店使用
+
+ 请在 {{ order.become_time }} (含)前到店消费
+
+
+
+
+
+
+
+
+
+ {{ order.goods[0].goods_name }}
+
+
+ 下单时间：{{ order.create_time }}
+
+
+ 数量：{{ order.goods[0].total_num }}
+
+
+ ￥
+ {{
+ order.goods[0].is_user_grade ? order.goods[0].grade_goods_price : order.goods[0].goods_price
+ }}
+
+
+
+
+
+
+
+
+
+ 券码信息({{ order.coupon.length }}张可用)
+
+ {{ order.become_time }} 23:59:59 到期
+
+
+
+
+
+ 券码{{ index + 1 }}
+ ·
+ {{ item.code }}
+
+ {{ item.clerk_id == 0 ? '待使用' : '已使用' }}
+
+
+
+
+
+
+
+ 适用门店
+ 联系商家
+
+
+
+
+
+
+
+ {{ order.extract_shop.shop_name }}
+
+
+
+ 营业时间 {{ order.extract_shop.shop_hours }}
+
+
+
+
+
+ {{ order.extract_shop.full_address }}
+
+
+
+
+
+
+ 订单信息
+
+
+
+ 实付金额
+ ￥{{ order.pay_price }}
+
+
+ 手机号
+ {{ order.extract.phone }}
+
+
+ 订单号
+ {{ order.order_no }}
+
+
+
+ 下单时间
+ {{ order.create_time }}
+
+
+ 购买数量
+ {{ order.goods[0].total_num }}
+
+
+
+
+
+
+
+
diff --git a/pages/shop/list.vue b/pages/shop/list.vue
new file mode 100644
index 0000000..278b397
--- /dev/null
+++ b/pages/shop/list.vue
@@ -0,0 +1,244 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.shop_name }}
+
+ {{ item.category.name }}
+ 营业时间:{{ item.shop_hours }}
+
+
+
+ {{ item.comment_count }}人评价
+
+
+ {{ item.full_address }}
+
+ 销量: {{ item.goods_sales }}
+ 距离: {{ item.distance }}km
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/user/index.vue b/pages/user/index.vue
index b3fa112..d1d758a 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -120,10 +120,10 @@
-
- 退出登录
-
+
+
+
+
diff --git a/pages/user/shop/addgoods.vue b/pages/user/shop/addgoods.vue
index ed5f8ce..a2cb45a 100644
--- a/pages/user/shop/addgoods.vue
+++ b/pages/user/shop/addgoods.vue
@@ -239,12 +239,12 @@
-
-
- 我已阅读并同意《商家入驻协议》
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 同意
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 套餐内容
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file