diff --git a/app/app.json b/app/app.json index d88add6..2f7a1c2 100644 --- a/app/app.json +++ b/app/app.json @@ -1,14 +1,14 @@ { "pages": [ + "pages/mine/mine", "pages/shop/show", + "pages/index/index", "pages/order/show", "pages/order/quasi", "pages/order/list", - "pages/index/index", "pages/address/list", "pages/address/add", "pages/address/select", - "pages/mine/mine", "pages/index/address", "pages/shop/category", "pages/shop/search" diff --git a/app/config.js b/app/config.js new file mode 100644 index 0000000..54074d0 --- /dev/null +++ b/app/config.js @@ -0,0 +1,16 @@ +/** + * 小程序配置文件 + */ + +var host = "apitest.ipaotui.com" +// var host = "api.ipaotui.com" +const debug = wx.getStorageSync('debug') +if (debug) { + host = "apitest.ipaotui.com" +} + + +module.exports = { + host, + qqmapKey: 'FPOBZ-UT2K2-ZFYUC-CX67E-IOOYS-7XFQ6' +} diff --git a/app/images/default-image.png b/app/images/default-image.png new file mode 100644 index 0000000..c4f976e Binary files /dev/null and b/app/images/default-image.png differ diff --git a/app/images/default.jpg b/app/images/default.jpg deleted file mode 100644 index e643e05..0000000 Binary files a/app/images/default.jpg and /dev/null differ diff --git a/app/images/map-marker.png b/app/images/map-marker.png deleted file mode 100644 index 778231e..0000000 Binary files a/app/images/map-marker.png and /dev/null differ diff --git a/app/images/takeout_ic_account.png b/app/images/takeout_ic_account.png new file mode 100644 index 0000000..061d7ee Binary files /dev/null and b/app/images/takeout_ic_account.png differ diff --git a/app/images/takeout_ic_address.png b/app/images/takeout_ic_address.png new file mode 100644 index 0000000..2e2204e Binary files /dev/null and b/app/images/takeout_ic_address.png differ diff --git a/app/pages/mine/mine.wxml b/app/pages/mine/mine.wxml index f837ef0..fc54ec1 100644 --- a/app/pages/mine/mine.wxml +++ b/app/pages/mine/mine.wxml @@ -2,7 +2,7 @@ - + 未登录 diff --git a/app/pages/shop/show.js b/app/pages/shop/show.js index c28a839..251bc4f 100644 --- a/app/pages/shop/show.js +++ b/app/pages/shop/show.js @@ -14,7 +14,7 @@ var initOrder = { Page({ data: { tabs: ["商品", "评价", "商家"], - activeIndex: 2, + activeIndex: 1, activeMenuIndex: 0, showCart: false, diff --git a/app/pages/shop/show.wxml b/app/pages/shop/show.wxml index c59863d..1585329 100644 --- a/app/pages/shop/show.wxml +++ b/app/pages/shop/show.wxml @@ -115,7 +115,7 @@ - + diff --git a/app/utils/util.js b/app/utils/util.js index fa32f08..b57f9bd 100644 --- a/app/utils/util.js +++ b/app/utils/util.js @@ -2,10 +2,10 @@ import timeago from './timeago.min' import QQMapWX from './qqmap-wx-jssdk.min' import { gcj02tobd09 } from './coordtransform' -// import { host } from '../config' +import { host, qqmapKey } from '../config' const qqmap = new QQMapWX({ - key: 'FPOBZ-UT2K2-ZFYUC-CX67E-IOOYS-7XFQ6' + key: qqmapKey }); function resolveAdInfo(adInfo) {