Leadfyy.co
/
uniapp-shikongwang
11
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'dev' of http://8.134.10.79:3000/Leadfyy.co/uniapp-shikongwang into dev

dev
邓平艺 5 years ago
parent
3fe0724e19 1515212190
commit
81c242febe
6 changed files with 28 additions and 19 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 26
      pages/collect/index.vue
  2. 11
      pages/goodsDetail/index.vue
  3. 4
      pages/login/index.vue
  4. 2
      pages/order/apply-details.vue
  5. 2
      pages/order/apply-refund.vue
  6. 2
      pages/order/confirm-order.vue

26
pages/collect/index.vue
View File

@ -3,18 +3,26 @@
<skeleton :loading="skeletonLoading" :row="6" :showAvatar="false" :showTitle="true">
<view class="list-box">
<view class="lf-row-between list-item" v-for="(item, index) in list" :key="item.id">
<image class="goods-img" :src="item.goods.cover" @click="enterDetail(index)"></image>
<image class="goods-img" mode="aspectFill" :src="item.goods.cover" @click="enterDetail(index)"></image>
<view style="width: 480rpx;">
<view class="lf-font-32 lf-line-1" @click="enterDetail(index)">{{ item.goods.name }}</view>
<view class="lf-row-between lf-m-t-20">
<view class="lf-flex">
<image class="shop-img" :src="item.goods.store.cover" v-if="item.goods.store.cover"></image>
<image class="shop-img" src="../../static/center/shop-logo.png" v-else></image>
<image class="shop-img" mode="aspectFill" :src="item.goods.store.cover" v-if="item.goods.store.cover"></image>
<image class="shop-img" mode="aspectFill" src="../../static/center/shop-logo.png" v-else></image>
<view class="lf-m-l-10 lf-font-28 lf-line-1 shop-name">{{ item.goods.store.name }}</view>
</view>
<view @click="switchCollect(index)" class="lf-font-40">
<u-icon name="heart-fill" color="#ff0f00" v-if="item.is_collect"></u-icon>
<u-icon name="heart" v-else></u-icon>
<view v-if="item.is_collect" class="flex flex-direction justify-around align-center text-center" style="width: 100%;">
<u-icon name="heart-fill" color="#ff0f00"></u-icon>
<text class="lf-font-24">取消收藏</text>
</view>
<view v-else class="flex flex-direction justify-around align-center text-center" style="width: 100%;">
<u-icon name="heart"></u-icon>
<text class="lf-font-24">添加收藏</text>
</view>
</view>
</view>
<view class="lf-m-t-20 lf-font-24 lf-color-gray">{{ item.created_at_text }}</view>
@ -115,12 +123,12 @@
border-radius: 20rpx;
}
.shop-img{
width: 60rpx;
height: 60rpx;
border-radius: 10rpx;
width: 50rpx;
height: 50rpx;
border-radius: 50%;
}
.shop-name{
width: 340rpx;
width: 305rpx;
color: #555555;
}
}

11
pages/goodsDetail/index.vue
View File

@ -31,8 +31,8 @@
<view class="lf-font-32 lf-font-bold">适用门店</view>
<view class="lf-m-t-20 lf-row-between">
<view class="lf-flex">
<image class="lf-fle shop-img" :src="goods_detail.store.cover" v-if="goods_detail.store.cover"></image>
<image class="lf-fle shop-img" src="../../static/center/shop-logo.png" v-else></image>
<image mode="aspectFill" class="lf-fle shop-img" :src="goods_detail.store.cover" v-if="goods_detail.store.cover"></image>
<image mode="aspectFill" class="lf-fle shop-img" src="../../static/center/shop-logo.png" v-else></image>
<view class="lf-font-32 lf-m-l-20 lf-line-1" style="max-width: 512rpx;">{{ goods_detail.store.name }}</view>
</view>
<view @click="makePhoneCall(goods_detail.store.tel)">
@ -141,11 +141,12 @@
},
// 打开地图
openMap(){
return;
// return;
uni.openLocation({
longitude: 108.36637,
latitude: 22.817746,
scale: 18
scale: 18,
name: this.goods_detail.store.address
})
},
// 跳转到确认下单页面
@ -275,7 +276,7 @@
.shop-img{
width: 60rpx;
height: 60rpx;
border-radius: 10rpx;
border-radius: 50%;
}
}

4
pages/login/index.vue
View File

@ -29,9 +29,9 @@
</checkbox-group>
<view class="lf-m-l-10 lf-font-24 lf-color-gray" style="display: inline-block;">
<text>请认真阅读并同意</text>
<text @click="enterAgree" style="color: #5c6ed1;">《{{ agreement.title }}》</text>
<text @click="enterAgree" class="text-orange">《{{ agreement.title }}》</text>
<text>，在小程序下单购买即表示您已默认同意</text>
<text @click="enterAgree" style="color: #5c6ed1;">《{{ agreement.title }}》</text>
<text @click="enterAgree" class="text-orange">《{{ agreement.title }}》</text>
<text>的所有条款。</text>
</view>
</view>

2
pages/order/apply-details.vue
View File

@ -65,7 +65,7 @@
<view class="padding-lr bg-white" style="padding-top: 30rpx;" v-if="checkArea">
<view class="cu-self menu">
<view class="text-gray lf-font-28">
由于产品的特殊性，在申请的过程中，供应商会向您收取部分费用。如有疑问可参与产品的<text @tap="$routerGo('/pages/agreement/agreement?id='+checkAreaId)" class="text-orange">《{{checkArea}}》</text>或咨询客服
由于产品的特殊性，在申请的过程中，供应商会向您收取部分费用。如有疑问可参考产品的<text @tap="$routerGo('/pages/agreement/agreement?id='+checkAreaId)" class="text-orange">《{{checkArea}}》</text>或咨询客服
</view>
</view>
</view>

2
pages/order/apply-refund.vue
View File

@ -66,7 +66,7 @@
<view class="padding-top padding-lr bg-white" v-if="applyDetails.agreement.article_id">
<view class="cu-self menu">
<view class="text-gray lf-font-28">
由于产品的特殊性，在申请的过程中，供应商会向您收取部分费用。如有疑问可参与产品的<text class="text-orange" @tap="$routerGo('/pages/agreement/agreement?id='+applyDetails.agreement.article_id)">《{{applyDetails.agreement.title}}》</text>或咨询客服
由于产品的特殊性，在申请的过程中，供应商会向您收取部分费用。如有疑问可参考产品的<text class="text-orange" @tap="$routerGo('/pages/agreement/agreement?id='+applyDetails.agreement.article_id)">《{{applyDetails.agreement.title}}》</text>或咨询客服
</view>
</view>
</view>

2
pages/order/confirm-order.vue
View File

@ -54,7 +54,7 @@
</view>
</checkbox-group>
<view class="lf-font-24 text-gray">
请认真阅读并同意<text @tap="$routerGo('/pages/agreement/agreement?id='+orderDetails.agreement.article_id)">《{{orderDetails.agreement.title}}》</text>，在小程序下单购买即表示您已默认同意<text @tap="$routerGo('/pages/agreement/agreement?id='+orderDetails.agreement.article_id)">《{{orderDetails.agreement.title}}》</text>的所有条款。
请认真阅读并同意<text @tap="$routerGo('/pages/agreement/agreement?id='+orderDetails.agreement.article_id)" class="text-orange">《{{orderDetails.agreement.title}}》</text>，在小程序下单购买即表示您已默认同意<text class="text-orange" @tap="$routerGo('/pages/agreement/agreement?id='+orderDetails.agreement.article_id)">《{{orderDetails.agreement.title}}》</text>的所有条款。
</view>
</view>
<view class="padding-lr padding-tb-sm bg-white flex justify-between align-center shadow">

Write Preview
Loading…
Cancel
Save