diff --git a/App.vue b/App.vue index d56d2d7..5129746 100644 --- a/App.vue +++ b/App.vue @@ -161,7 +161,7 @@ jpushModule.initJPushService() jpushModule.addConnectEventListener(result => { let connectEnable = result.connectEnable - // console.log("jpush连接", connectEnable) + console.log("jpush连接", connectEnable) }) @@ -222,7 +222,8 @@ }, onShow() { - + + let that = this // 记录H5和公众号 if (this.$store.state.app.token) { diff --git a/api/api.js b/api/api.js index c382e10..f5545dc 100644 --- a/api/api.js +++ b/api/api.js @@ -5,7 +5,7 @@ import request from "@/utils/request.js"; * */ export function cloudWarehouse(data) { - return request.get("store/product/cloudWarehouse", data); + return request.get("store/product/cloudWarehouse", data, { noAuth: true }); } /** * 获取云仓分类 diff --git a/manifest.json b/manifest.json index f637671..c8c719f 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name" : "惠农生活", "appid" : "__UNI__3A527D1", "description" : "", - "versionName" : "1.4.5", - "versionCode" : 145, + "versionName" : "1.4.7", + "versionCode" : 147, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { @@ -103,13 +103,13 @@ "weixin" : { "__platform__" : [ "ios", "android" ], "appid" : "wx9d68c92b550ddd1e", - "UniversalLinks" : "https://mer.crmeb.net/" + "UniversalLinks" : "https://shop.lihaink.cn/" } }, "share" : { "weixin" : { "appid" : "wx9d68c92b550ddd1e", - "UniversalLinks" : "https://mer.crmeb.net/" + "UniversalLinks" : "https://shop.lihaink.cn/" } }, "geolocation" : { @@ -160,7 +160,7 @@ }, "nativePlugins" : { "JG-JCore" : { - "JPUSH_APPKEY_IOS" : "b5f679f4357018605ea6fd2e", + "JPUSH_APPKEY_IOS" : "8a5efd65cda14fafa6e64ad3", "JPUSH_CHANNEL_IOS" : "", "JPUSH_APPKEY_ANDROID" : "b5f679f4357018605ea6fd2e", "JPUSH_CHANNEL_ANDROID" : "", @@ -178,7 +178,7 @@ "JPUSH_APPKEY_IOS" : { "des" : "[iOS]极光portal配置应用信息时分配的AppKey", "key" : "JCore:APP_KEY", - "value" : "7869a2f94b120cfb4431b96f" + "value" : "daebe19b547c43128796a078" }, "JPUSH_CHANNEL_IOS" : { "des" : "[iOS]用于统计分发渠道，不需要可填默认值developer-default", @@ -199,9 +199,9 @@ } }, "JG-JPush" : { - "JPUSH_ISPRODUCTION_IOS" : "", + "JPUSH_ISPRODUCTION_IOS" : "true", "JPUSH_ADVERTISINGID_IOS" : "", - "JPUSH_DEFAULTINITJPUSH_IOS" : "", + "JPUSH_DEFAULTINITJPUSH_IOS" : "true", "JPUSH_OPPO_APPKEY" : "", "JPUSH_OPPO_APPID" : "", "JPUSH_OPPO_APPSECRET" : "", diff --git a/pages.json b/pages.json index f8048ae..c26eb18 100644 --- a/pages.json +++ b/pages.json @@ -839,7 +839,7 @@ }, { "path": "payment/payment", "style": { - "navigationBarTitleText": "", + "navigationBarTitleText": "支付", "enablePullDownRefresh": false } diff --git a/pages/admin/orderDetail/index.vue b/pages/admin/orderDetail/index.vue index 1517bb5..d7fc7a7 100644 --- a/pages/admin/orderDetail/index.vue +++ b/pages/admin/orderDetail/index.vue @@ -146,7 +146,7 @@ - + 同意 diff --git a/pages/admin/order_cancellation/index.vue b/pages/admin/order_cancellation/index.vue index 2f54607..9a3d94d 100644 --- a/pages/admin/order_cancellation/index.vue +++ b/pages/admin/order_cancellation/index.vue @@ -131,8 +131,12 @@ // console.log(self.verify_code); verifierOrder(self.mer_id,self.verify_code) .then(res => { + // uni.navigateTo({ + // url: '/pages/admin/cancellate_result/index?code='+self.verify_code+'&mer_id='+self.mer_id + // }); + uni.navigateTo({ - url: '/pages/admin/cancellate_result/index?code='+self.verify_code+'&mer_id='+self.mer_id + url: '/pages/admin/orderList/index?types=2'+'&mer_id='+self.mer_id }); }) .catch(res => { @@ -161,8 +165,11 @@ scanType: ["qrCode", "barCode"] }).then(res=>{ this.verify_code = res.resultStr + // uni.navigateTo({ + // url: '/pages/admin/cancellate_result/index?code='+self.verify_code+'&mer_id='+self.mer_id + // }); uni.navigateTo({ - url: '/pages/admin/cancellate_result/index?code='+self.verify_code+'&mer_id='+self.mer_id + url: '/pages/admin/orderList/index?types=2'+'&mer_id='+self.mer_id }); // this.codeChange(); }).catch(res => { diff --git a/pages/commissionedSales/delegation_details/index.vue b/pages/commissionedSales/delegation_details/index.vue index 3cf0d27..dc3c98c 100644 --- a/pages/commissionedSales/delegation_details/index.vue +++ b/pages/commissionedSales/delegation_details/index.vue @@ -109,8 +109,8 @@ - - 查看TA提到的宝贝(2) + + 查看TA提到的宝贝({{objinfo.product_list.length}}) @@ -124,7 +124,7 @@ - + diff --git a/pages/commissionedSales/receivedCommission/index.vue b/pages/commissionedSales/receivedCommission/index.vue index 729a4b2..f3443be 100644 --- a/pages/commissionedSales/receivedCommission/index.vue +++ b/pages/commissionedSales/receivedCommission/index.vue @@ -227,6 +227,7 @@ import emptyPage from '@/components/emptyPage.vue'; import { entrustlist, + addEntrustCart, finishchain, checkchain } from '@/api/sale.js' @@ -365,9 +366,25 @@ }, //下单 order(item) { - uni.navigateTo({ - url: '/pages/commissionedSales/delegation_details/index?id=' + item.community_id + '&type=1' - }) + // uni.navigateTo({ + // url: '/pages/commissionedSales/delegation_details/index?id=' + item.community_id + '&type=1' + // }) + addEntrustCart({ + community_id: item.community_id + }).then(res => { + + if (res.status == 200) { + this.$util.Tips({ + title: res.message, + icon: 'success' + }) + uni.navigateTo({ + url: '/pages/users/order_confirm/index?cartId=' + res.data.cart_id.toString() + }) + } + + }) + }, //申请结束委托申请 deteragrss(item) { diff --git a/pages/goods_details/index.vue b/pages/goods_details/index.vue index 153c189..41562cc 100644 --- a/pages/goods_details/index.vue +++ b/pages/goods_details/index.vue @@ -290,8 +290,8 @@ {{description.content.title}} - - + + @@ -704,11 +704,6 @@ that.getConfig(); uni.hideLoading(); }, - - onHide() { - - this.CartCount = 0 - }, /** * 用户点击右上角分享 */ diff --git a/pages/margin/margin.vue b/pages/margin/margin.vue index 356de23..122ff8e 100644 --- a/pages/margin/margin.vue +++ b/pages/margin/margin.vue @@ -112,6 +112,7 @@ merchant({ id: this.mer_id }).then((res) => { + this.merchant_Data = res.data }); }, @@ -137,14 +138,14 @@ orderInfo: res.data .config, //微信、支付宝订单数据 【注意微信的订单信息，键值应该全部是小写，不能采用驼峰命名】 success: (res) => { - this.$util.Tips({ + that.$util.Tips({ title: '支付成功' }); - this.decimal() - this.list(true) + that.decimal() + that.list(true) }, fail: (err) => { - this.$util.Tips({ + that.$util.Tips({ title: '支付失败' }); @@ -176,8 +177,6 @@ } .content-order { - - background: #F4F4F4; border-radius: 21rpx 21rpx; margin-top: 30rpx; diff --git a/pages/moreProject/moreProject.vue b/pages/moreProject/moreProject.vue index e681ae3..8b6ad68 100644 --- a/pages/moreProject/moreProject.vue +++ b/pages/moreProject/moreProject.vue @@ -204,7 +204,7 @@ 缴纳保证金 - + + {{town}}里海云仓 - + + + 搜索 --> - - - + + + @@ -114,22 +114,23 @@ - - - + + - 供销综合云市场 + 供销综合云商品 - + v-model="keyword" class="serch_cls" style="height: 56.82rpx;"> + + 搜索 - - + @@ -404,7 +404,8 @@ - + + @@ -492,7 +493,7 @@ page_num: 1, act_img: "", cartTagInfo: {}, - isAuto: false, + headTop1: "", actList: [{ tit: '综合', @@ -510,6 +511,7 @@ }], status: "loadmore", flag: false, + isAuto: false, isShowAuth: false, //是否隐藏授权 } @@ -859,8 +861,9 @@ }, addcart(item, i) { if (!this.isLogin) { - this.isAuto = true; - this.isShowAuth = true + console.log('2222') + this.isAuto = true + this.isShowAuth = true; return } @@ -969,6 +972,19 @@ } } + .serchbtn { + // position: absolute; + // right: 5rpx; + // top: 5rpx; + width: 100rpx; + height: 50rpx; + border-radius: 30rpx; + text-align: center; + line-height: 50rpx; + // background-color: #FEAB00; + background: linear-gradient(to right, #F84221, #FF6D20); + } + .selected-list { padding: 24rpx 14rpx; border-radius: 10.51rpx 10.51rpx 10.51rpx 10.51rpx; @@ -1201,7 +1217,7 @@ .img_cls { position: absolute; top: 50%; - right: 7rpx; + right: 5rpx; transform: translateY(-50%); } diff --git a/pages/nongKe/food/index.vue b/pages/nongKe/food/index.vue index d84703e..386ad5e 100644 --- a/pages/nongKe/food/index.vue +++ b/pages/nongKe/food/index.vue @@ -26,8 +26,9 @@ :value='sotreParam.keyword' @confirm="searchSubmit"> --> - + 搜索 + @@ -703,7 +704,19 @@ margin: 0; padding: 0; } - +.serchbtn { + // position: absolute; + // right: 5rpx; + // top: 5rpx; + width: 100rpx; + height: 50rpx; + border-radius: 30rpx; + text-align: center; + line-height: 50rpx; + // background-color: #FEAB00; + color: #fff; + background: linear-gradient(to right, #F84221, #FF6D20); + } .com_name { font-size: 32rpx; // background-color: red; @@ -1304,7 +1317,7 @@ .img_cls { position: absolute; top: 50%; - right: 7rpx; + right: 5rpx; transform: translateY(-50%); } diff --git a/pages/nongKe/specialty/index.vue b/pages/nongKe/specialty/index.vue index 9a5ab18..a2df3ba 100644 --- a/pages/nongKe/specialty/index.vue +++ b/pages/nongKe/specialty/index.vue @@ -9,8 +9,11 @@ - + + + @@ -27,8 +30,9 @@ :value='sotreParam.keyword' @confirm="searchSubmit"> --> - + 搜索 + @@ -700,6 +704,19 @@