|
@@ -229,7 +229,7 @@
|
|
|
</view>
|
|
</view>
|
|
|
</view>
|
|
</view>
|
|
|
<block v-if="ghsInfo.live == 1">
|
|
<block v-if="ghsInfo.live == 1">
|
|
|
- <view class="button_7 flex-col" @click="kmCg()"><text class="text_13">昆明直采</text></view>
|
|
|
|
|
|
|
+ <view class="button_7 flex-col" @click.stop="fnOpenKmCg()" v-if="ghsInfo.openKmCg && ghsInfo.openKmCg == 1"><text class="text_13">昆明直采</text></view>
|
|
|
<view class="button_4 flex-col" v-if="ghsInfo.isOpen == 1" @click="enterShop(ghsInfo)"><text class="text_13">买花</text></view>
|
|
<view class="button_4 flex-col" v-if="ghsInfo.isOpen == 1" @click="enterShop(ghsInfo)"><text class="text_13">买花</text></view>
|
|
|
<view class="button_5 flex-col" v-else @click="enterShop(ghsInfo)"><text class="text_13">买花</text></view>
|
|
<view class="button_5 flex-col" v-else @click="enterShop(ghsInfo)"><text class="text_13">买花</text></view>
|
|
|
</block>
|
|
</block>
|
|
@@ -516,18 +516,22 @@ export default {
|
|
|
fillCg(item){
|
|
fillCg(item){
|
|
|
this.pageTo({url:'/pagesPurchase/addCg?ghsId='+item.id+'&ghsName='+item.name})
|
|
this.pageTo({url:'/pagesPurchase/addCg?ghsId='+item.id+'&ghsName='+item.name})
|
|
|
},
|
|
},
|
|
|
- kmCg(){
|
|
|
|
|
- // #ifdef MP-WEIXIN
|
|
|
|
|
|
|
+ fnOpenKmCg(){
|
|
|
|
|
+ console.log('yes')
|
|
|
let self = this
|
|
let self = this
|
|
|
|
|
+ // #ifdef MP-WEIXIN
|
|
|
uni.navigateToMiniProgram({
|
|
uni.navigateToMiniProgram({
|
|
|
- appId: this.getappIdList.mall.miniAppId,
|
|
|
|
|
- path: url + '?account=' + self.loginInfo.shopId,
|
|
|
|
|
|
|
+ appId: self.currentGhs.kmCgAppId,
|
|
|
|
|
+ path: self.currentGhs.kmCgUrl,
|
|
|
//develop 开发版 trial 体验版 release 正式版
|
|
//develop 开发版 trial 体验版 release 正式版
|
|
|
envVersion: process.env.NODE_ENV === 'development' ? 'develop' : 'release',
|
|
envVersion: process.env.NODE_ENV === 'development' ? 'develop' : 'release',
|
|
|
extraData: {},
|
|
extraData: {},
|
|
|
success (res) {}
|
|
success (res) {}
|
|
|
})
|
|
})
|
|
|
// #endif
|
|
// #endif
|
|
|
|
|
+ // #ifdef APP-PLUS
|
|
|
|
|
+ self.$msg('开发中')
|
|
|
|
|
+ // #endif
|
|
|
},
|
|
},
|
|
|
enterShop(item) {
|
|
enterShop(item) {
|
|
|
let that = this
|
|
let that = this
|