diff --git a/components/business-components/factoryItem.vue b/components/business-components/factoryItem.vue index a751bad..93c3702 100644 --- a/components/business-components/factoryItem.vue +++ b/components/business-components/factoryItem.vue @@ -3,7 +3,7 @@ - {{ item.name }} + {{ item.name }} {{ item.score }}分 @@ -43,6 +43,16 @@ export default { return [] } return arr.slice(0, length) + }, + jump(item) { + if (!item.factoryId) { + uni.showToast({ + title: '暂无工厂详情', + icon: 'none' + }) + return + } + go2('factory-info', { id: item.factoryId }) } } } diff --git a/env/index.js b/env/index.js index a0bfcb1..bcf6a22 100644 --- a/env/index.js +++ b/env/index.js @@ -1,8 +1,8 @@ /** * @description 唯一环境变量 */ -const env = 'test' +// const env = 'test' // const env = 'dev' -// const env = 'production' +const env = 'production' export default env diff --git a/manifest.json b/manifest.json index a0b7579..1b8f6f7 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "name" : "印包客", "appid" : "__UNI__EBBA73E", "description" : "", - "versionName" : "1.0.1", + "versionName" : "1.0.2", "versionCode" : 100, "transformPx" : false, "networkTimeout" : { @@ -27,7 +27,8 @@ "Share" : {}, "Payment" : {}, "Push" : {}, - "VideoPlayer" : {} + "VideoPlayer" : {}, + "Geolocation" : {} }, /* 应用发布信息 */ "distribute" : { @@ -84,8 +85,8 @@ "geolocation" : { "amap" : { "__platform__" : [ "ios", "android" ], - "appkey_ios" : "0182ee2a9fdd5fd3ef6a8bd5a2f98325", - "appkey_android" : "877848546f7f3717101a17c33e1d4df3" + "appkey_ios" : "d574088098995ca1210d6b2df09c5dc9", + "appkey_android" : "c8116effd223c3f69a120f86695afc40" } }, "share" : { diff --git a/pages/device-info/index.vue b/pages/device-info/index.vue index 103f82c..4ec63a5 100644 --- a/pages/device-info/index.vue +++ b/pages/device-info/index.vue @@ -24,7 +24,7 @@ 删除 - + 编辑 @@ -41,12 +41,14 @@ export default { info: { imgItemList: [] }, id: null, swiperCurrent: 0, - operation: 'edit' + operation: 'edit', + factoryId: null } }, onLoad(options) { if (options.id) { this.id = options.id + this.factoryId = options.factoryId } if (options.operation) { this.operation = options.operation diff --git a/pages/device-production-info/index.vue b/pages/device-production-info/index.vue index 307f0a2..b1de430 100644 --- a/pages/device-production-info/index.vue +++ b/pages/device-production-info/index.vue @@ -3,8 +3,9 @@ 分享 - - + + + diff --git a/pages/factory/index.vue b/pages/factory/index.vue index fe5315b..6518ee5 100644 --- a/pages/factory/index.vue +++ b/pages/factory/index.vue @@ -164,11 +164,13 @@ export default { uni.getLocation({ type: 'gcj02', success: (res) => { + console.log('success:', res) this.condition.latitude = res.latitude this.condition.longitude = res.longitude resolve() }, fail: (err) => { + console.log('error:', err) this.condition.latitude = null this.condition.longitude = null reject() diff --git a/pages/mine/index.vue b/pages/mine/index.vue index 01be0b9..79b57e8 100644 --- a/pages/mine/index.vue +++ b/pages/mine/index.vue @@ -111,7 +111,7 @@