xthyg
/
minAPP-hyg
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' into hyg-dev

Browse Source 
# Conflicts:
#	common/config.js
dev
Tuzki 2 years ago
parent 1c290caa8c d0af7e5210
commit 8ab05bb0f8
4 changed files with 15 additions and 9 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 8
      common/config.js
  2. 7
      components/xi-waterfall/xi-waterfall.vue
  3. 7
      pages/traffic/outTraffic.vue
  4. 2
      sunPackIndex/feiyi/feiyidetail/feiyidetail.vue

8
common/config.js
Unescape View File

@ -1,7 +1,7 @@
const REAUEST_ROOTPATH = "https://www.lbgjtoa.com/";
const ROOTPATH = "https://www.lbgjtoa.com/";
// const REAUEST_ROOTPATH = "http://192.168.130.109:8083/";
// const ROOTPATH = "http://192.168.130.109:8083/";
const REAUEST_ROOTPATH = "https://www.lbgjtoa.com/";
const ROOTPATH = "https://www.lbgjtoa.com/";
// const REAUEST_ROOTPATH = "http://192.168.130.109:8083/";
// const ROOTPATH = "http://192.168.130.109:8083/";
//手绘图项目名称
const HANDDRAWNNAME = "";
module.exports = {

7
components/xi-waterfall/xi-waterfall.vue
Unescape View File

@ -4,7 +4,7 @@
<!-- 第一列 -->
<view class="w_two" id="columnFirst">
<view class="pu_item" @tap="goToDetail(item)" v-for="(item, index) in columnFirst" :key="index">
<image :src="item.logo" mode="scaleToFill" class="pul_img"></image>
<image :src="item.logo" mode="scaleToFill" class="pul_img" :class="item.type == 2932?'desc_pb_imgs':''"></image>
<view class="desc_pb" :class="item.type == 2932?'desc_pb_title':''">{{ item.title }}</view>
<view class="desc_pb desc_price" v-if="item.type == 2932">¥{{ item.jointime }}</view>
</view>
@ -12,7 +12,7 @@
<!-- 第二列 -->
<view class="w_two" id="columnSecond">
<view class="pu_item" @tap="goToDetail(item)" v-for="(item, index) in columnSecond" :key="index">
<image :src="item.logo" mode="scaleToFill" class="pul_img"></image>
<image :src="item.logo" mode="scaleToFill" class="pul_img" :class="item.type == 2932?'desc_pb_imgs':''"></image>
<view class="desc_pb" :class="item.type == 2932?'desc_pb_title':''">{{ item.title }}</view>
<view class="desc_pb desc_price" v-if="item.type == 2932">¥{{ item.jointime }}</view>
</view>
@ -161,4 +161,7 @@ export default {
color: crimson;
font-size: 34rpx;
}
.desc_pb_imgs{
height: 340rpx;
}
</style>

7
pages/traffic/outTraffic.vue
Unescape View File

@ -2,9 +2,12 @@
<view class="v-traffic-box">
<view class="dh-box">
<image src="https://www.lbgjtoa.com/appImg/v-address_01.jpg" class="v-traffic-img" mode="widthFix"></image>
<view class="dh-btn" @click="daohang">导航</view>
</view>
<image @click="goToPages()" src="https://www.lbgjtoa.com/appImg/v-address_02.jpg" class="v-traffic-img" mode="widthFix"></image>
<view style="display: flex;">
<image @click="goToPages()" src="https://www.lbgjtoa.com/appImg/v-address_07.jpg" class="v-traffic-img" mode="widthFix"></image>
<image @click="daohang" src="https://www.lbgjtoa.com/appImg/v-address_08.jpg" class="v-traffic-img" mode="widthFix"></image>
</view>
<image src="https://www.lbgjtoa.com/appImg/v-address_03.jpg" class="v-traffic-img" mode="widthFix"></image>
<image src="https://www.lbgjtoa.com/appImg/v-address_04.jpg" class="v-traffic-img" mode="widthFix"></image>
<image src="https://www.lbgjtoa.com/appImg/v-address_05.jpg" class="v-traffic-img" mode="widthFix"></image>

2
sunPackIndex/feiyi/feiyidetail/feiyidetail.vue
Unescape View File

@ -21,7 +21,7 @@
</view>
</view>
</view>
<view class="yuyue-btn1">
<view class="yuyue1-btn">
<view class="an_box_2">
<button form-type="submit" class="yue_fm_btn yue_f_bun" @click="buyit(info)">立即购买</button>
</view>

Write Preview
Loading…
Cancel
Save