Browse Source

丘比养车修改

lilei 4 years ago
parent
commit
0e144e7790

+ 1 - 0
.eslintignore

@@ -1,2 +1,3 @@
 build/*.js
 config/*.js
+src

+ 2 - 2
package.json

@@ -1,8 +1,8 @@
 {
-  "name": "zyyc-wxmini",
+  "name": "qbyc-wxmini",
   "version": "1.0.0",
   "mpvueTemplateProjectVersion": "0.1.0",
-  "description": "A Mpvue project",
+  "description": "丘比养车",
   "author": "lilei",
   "private": true,
   "scripts": {

+ 3 - 2
project.config.json

@@ -4,13 +4,14 @@
 		"urlCheck": false,
 		"es6": true,
 		"postcss": true,
+		"preloadBackgroundData": false,
 		"minified": true,
 		"newFeature": true,
-		"coverView": true,
-		"nodeModules": false,
 		"autoAudits": false,
+		"coverView": true,
 		"showShadowRootInWxmlPanel": true,
 		"scopeDataCheck": false,
+		"nodeModules": false,
 		"checkInvalidKey": true,
 		"checkSiteMap": true,
 		"uploadWithSourceMap": true,

+ 4 - 4
src/api/request.js

@@ -6,10 +6,10 @@ function request(options) {
   //   title: '加载中' // 数据请求前loading,提高用户体验
   // });
   return new Promise((resolve, reject) => {
-    const baseUrl = 'https://zyyc.chelingzhu.com/zyyc-shop/'; // 预发布
-    //const baseUrl = 'https://shop.zy-yc.cn/zyyc-shop/'; // 生产
-    //const baseUrl = 'http://192.168.16.103:7102/zyyc-shop/';
-    //const baseUrl = process.env.NODE_ENV === 'production' ? proUrl : devUrl;
+    // const baseUrl = 'https://zyyc.chelingzhu.com/zyyc-shop/'; // 预发布
+    const baseUrl = 'https://shop.zy-yc.cn/zyyc-shop/'; // 生产
+    // const baseUrl = 'http://192.168.16.103:7102/zyyc-shop/';
+    // const baseUrl = process.env.NODE_ENV === 'production' ? proUrl : devUrl;
 
     let _obj = {
       url: '',

+ 2 - 9
src/app.json

@@ -1,7 +1,7 @@
 {
   "tabBar": {
     "color": "#7d7e80",
-    "selectedColor": "#ed3f14",
+    "selectedColor": "#ff8811",
     "backgroundColor": "#ffffff",
     "list": [
       {
@@ -10,12 +10,6 @@
         "iconPath": "./static/img/icon1black.png",
         "selectedIconPath": "./static/img/icon1red.png"
       },
-      {
-        "text": "套餐",
-        "pagePath": "pages/bundle/main",
-        "iconPath": "./static/img/icon2black.png",
-        "selectedIconPath": "./static/img/icon2red.png"
-      },
       {
         "text": "门店",
         "pagePath": "pages/store/main",
@@ -68,6 +62,5 @@
     "scope.userLocation": {
       "desc": "您的位置信息将用于小程序帮您找出最近的门店"
     }
-  },
-  "navigateToMiniProgramAppIdList": ["wxed9c04d05ab849f9"]
+  }
 }

+ 6 - 9
src/components/BundleCard.vue

@@ -5,7 +5,6 @@
       <img class="img" :src="options.icon1" alt="">
     </div>
     <div class="content">
-
         <div class="header">
           <div class="title">{{options.name}}</div>
           <div class="sales" v-if="options.stock>0">
@@ -96,7 +95,7 @@ export default {
   }
 
   .content .title {
-    font-size: 35rpx;
+    font-size: 30rpx;
   }
 
   .content .desc {
@@ -115,12 +114,12 @@ export default {
 
   .detail-footer {
     display: flex;
-    margin-top: 10rpx;
+    margin-top: 0;
     font-weight: bold;
   }
 
   .footer .label, .original-price {
-    font-size: 0.6em;
+    font-size: 0.8em;
     display: inline-block;
     margin-right: 10rpx;
   }
@@ -128,20 +127,18 @@ export default {
   .original-price {
     flex: 1;
     color: #bbbec4;
-    font-size: 0.7em;
+    font-size: 0.8em;
     text-decoration: line-through;
     display: flex;
     align-items: flex-end;
   }
-
-
   .current-price {
     color: #ed3f14;
+    font-size: 1em;
   }
-
   .current-price--Offline {
     color: #bbbec4;
-    font-size: 0.8em;
+    font-size: 1em;
   }
 }
 </style>

+ 3 - 2
src/components/NoData.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="no-data" :class="clazz" v-if="isShow" >
-    <van-icon name="orders-o" size="80px" color="#bbbec4" />
+    <van-icon name="orders-o" size="40px" color="#bbbec4" />
     <div>{{name}}</div>
   </div>
 </template>
@@ -39,7 +39,8 @@ export default {
 <style>
 .no-data {
   text-align: center;
-  padding-top: 20vh;
+  padding-top: 50rpx;
   color: #bbbec4;
+  font-size: 30rpx;
 }
 </style>

+ 20 - 8
src/components/OrderCard.vue

@@ -4,7 +4,7 @@
       <div class="order-no">
         <span>订单编号: </span><span>{{options.number}}</span>
       </div>
-      <div class="order-status">
+      <div class="order-status" :class="options.orderFlag">
         {{getPayStatus}}
       </div>
     </div>
@@ -160,14 +160,24 @@ export default {
     justify-content: space-between;
     font-size: 25rpx;
     border-bottom: 1px solid #e9eaec;
-
     .order-no {
       color: #80848f;
     }
-
-    .order-status {
+    .UNPA {
       color: #ed3f14;
     }
+    .INPA {
+      color: #00aaff;
+    }
+    .PAED {
+      color: #00aa00;
+    }
+    .CAEL {
+      color: #999999;
+    }
+    .SYCA {
+      color: #999999;
+    }
   }
 
   .content {
@@ -177,7 +187,9 @@ export default {
 
     .product-img {
       width: 35%;
-
+      border-radius : 0.5em;
+      overflow: hidden;
+      border: 1px solid #f8f8f8;
       img {
         width: 100%;
         height: 100%;
@@ -187,7 +199,7 @@ export default {
 }
 
 .product-info {
-  padding-left: 10%;
+  padding-left: 1em;
   box-sizing: border-box;
   font-size: 25rpx;
   flex: 1;
@@ -206,8 +218,8 @@ export default {
   }
 
   .price {
-    color: #ed3f14;
-    font-size: 1.2em;
+    color: #ff5500;
+    font-size: 1.4em;
     font-weight: bold;
   }
 

+ 1 - 2
src/components/swiper.vue

@@ -51,8 +51,7 @@ export default {
 
 <style lang="stylus" scoped>
 .swiper {
-  height: 350rpx !important;
-
+  height: 200rpx !important;
   img {
     height: 100%;
     width: 100%;

+ 22 - 17
src/pages/bundleDetail/index.vue

@@ -3,6 +3,14 @@
     <div class=" bundle-detail page--loading" :class="{'page--finished': finished }">
       <b-card :options="options" type="detail" />
       <div class="detail-info">
+        <div class="bundle-detail-desc">
+          <div class="bundle-detail-title">
+            <van-icon name="stop" class="detail-title-icon" /> 套餐有效期:
+            <div class="detail-text">
+              <span>{{options.expiryDate}} 过期</span>
+            </div>
+          </div>
+        </div>
         <div class="bundle-detail-desc">
           <div class="bundle-detail-title">
             <van-icon name="stop" class="detail-title-icon" /> 套餐描述:
@@ -11,14 +19,14 @@
             {{options.description}}
           </div>
         </div>
-
-        <div class="bundle-detail-title">
-          <van-icon name="stop" class="detail-title-icon" /> 套餐详情:
-        </div>
-        <div class="detail-content-imgs">
-          <image :src="img" class="detail-img"  v-for="(img, index) in imgList" :key="index" mode="widthFix" />
+        <div class="bundle-detail-desc">
+          <div class="bundle-detail-title">
+            <van-icon name="stop" class="detail-title-icon" /> 套餐详情:
+          </div>
+          <div class="detail-content-imgs">
+            <image :src="img" class="detail-img"  v-for="(img, index) in imgList" :key="index" mode="widthFix" />
+          </div>
         </div>
-
       </div>
       <div class="submit-btn" v-if="options.showFlag === '1'&&options.stock>0" @click="sumbitOrder">
         立即下单
@@ -130,6 +138,7 @@ export default {
 <style lang="stylus" scoped>
 .bundle-detail-page {
   height: 100vh;
+  font-size : 14px;
 }
 
 .bundle-detail {
@@ -144,7 +153,7 @@ export default {
     right: 0;
     bottom: 0;
     height: 50px;
-    background-color: #f44;
+    background-color: #ff5500;
     text-align: center;
     line-height: 50px;
     font-size: 1.2em;
@@ -157,21 +166,18 @@ export default {
   margin-bottom: 50px;
 
   .bundle-detail-desc {
-    border-top: 1rpx solid #dcdee2;
-    border-bottom: 1rpx solid #dcdee2;
-    margin: 10px 0;
-    padding: 5px 0;
+    border-top: 1rpx solid #f8f8f8;
+    padding: 10px 0;
 
     .detail-text {
-      font-size: 0.8em;
-      padding: 5px 5px 0 2px;
+      font-size: 0.9em;
+      padding: 10px 10px 0 5px;
       box-sizing: border-box;
     }
   }
 
   .bundle-detail-title {
-    font-size: 0.9em;
-
+    font-size: 1em;
     .detail-title-icon {
       position: relative;
       top: 4rpx;
@@ -180,7 +186,6 @@ export default {
 
   .detail-content-imgs {
     margin-top: 5px;
-
     .detail-img {
       width: 100%;
       height: auto;

+ 3 - 3
src/pages/couponList/index.vue

@@ -6,7 +6,7 @@
           <div class="coupon-item" v-for="item in list1" :key="item.couponId">
             <v-coupon :options="item" :canUse="true" @use="useCoupon" />
           </div>
-           <no-data :options="list1"/>
+           <no-data name="暂无优惠卷" :options="list1"/>
         </scroll-view>
 
       </van-tab>
@@ -15,7 +15,7 @@
           <div class="coupon-item" v-for="item in list2" :key="item.couponId">
             <v-coupon :options="item" />
           </div>
-          <no-data :options="list2"/>
+          <no-data name="暂无优惠卷" :options="list2"/>
         </scroll-view>
       </van-tab>
       <van-tab title="已过期">
@@ -23,7 +23,7 @@
           <div class="coupon-item" v-for="item in list0" :key="item.couponId">
             <v-coupon :options="item" :canUse="false" :status="false" />
           </div>
-          <no-data :options="list0"/>
+          <no-data name="暂无优惠卷" :options="list0"/>
         </scroll-view>
       </van-tab>
     </van-tabs>

+ 125 - 78
src/pages/index/index.vue

@@ -3,48 +3,77 @@
     <div class="header">
       <img class="logo" src="https://zyyc.oss-cn-beijing.aliyuncs.com/shop_mini/icons/logo-full.png" alt="">
       <div class="header-ads">
-        <roll-ad :options="rollads"></roll-ad>
+        养出色,爱生活
       </div>
     </div>
     <view>
       <Swiper :banners="banner" />
     </view>
-
+    <!-- 热门活动 -->
+    <div class="meal-title"><div><span></span>热门活动</div></div>
     <ul class="meal-panel">
       <li class="meal-items" v-for="item in items" :key="item.id" @click="toDetail(item)">
         <div class="item-left">
           <div class="item-title">
             <span>{{item.name}}</span><span class="tag" v-if="item.tag && item.tag.length > 0">{{item.tag}}</span>
           </div>
-          <div class="item-desc">{{item.enName}}</div>
         </div>
         <img class="item-right-img" :src="item.icon" alt="">
       </li>
     </ul>
-    <div class="ad-panel">
-      <img class="ad-img" :src="ad.icon" alt="" @click="toDetail(ad)">
+    <!-- 我的订单 -->
+    <div class="meal-title"><div><span></span>我的订单</div><div class="mores" @click="toViewOrder">查看更多<van-icon name="arrow" /></div></div>
+    <scroll-view scroll-y v-if="isLogin" class="content">
+      <order-card v-for="item in orderList" :options="item" :key="item.id" @refresh="getOrderList"></order-card>
+      <no-data :options="orderList" name="暂无订单"/>
+    </scroll-view>
+    <div class="noLogin" v-else>
+      <div>请登录后查看您的订单</div>
+      <div>
+        <span @click="toLogin">立即登录</span>
+      </div>
     </div>
   </div>
 </template>
 
 <script>
 import { getIndexData, getRollAd } from '@/api/api';
+import { customerBundleList } from '@/api/bundle';
+import { checkLogin } from '@/api/login';
+import NoData from '@/components/NoData';
+import OrderCard from '@/components/OrderCard';
 import Swiper from '@/components/swiper';
 import RollAD from '@/components/RollAD';
 import storage from '@/utils/storage.js'
 
 export default {
-  components: { Swiper, 'roll-ad': RollAD },
+  components: { Swiper, 'roll-ad': RollAD , 'order-card': OrderCard, 'no-data': NoData},
   name: 'indexPage',
   data() {
     return {
       ad: {},
       items: [],
       banner: [],
-      rollads: []
+      orderList: [],
+      isLogin: false
     };
   },
   methods: {
+    getOrderList() {
+      const _this = this;
+      customerBundleList({}).then(res => {
+        if (res.status === '200') {
+          _this.orderList = res.data;
+        } else {
+          wx.showToast({
+            title: res.message,
+            icon: 'none',
+            duration: 2500
+          });
+        }
+        wx.hideLoading();
+      });
+    },
     toDetail(item) {
       console.log(item)
       let url = item.redirectPath + '?title=' + item.name
@@ -93,54 +122,50 @@ export default {
     	});
     },
     setIndexData(data){
-      const _ad = data.filter(item => item.type.toLocaleUpperCase() === 'AD');
       this.banner = data.filter(item => item.type.toLocaleUpperCase() === 'BANNER');
       this.items = data.filter(item => item.type.toLocaleUpperCase() === 'LIST');
-      if (_ad && _ad.length > 0) {
-        this.ad = _ad[0];
-      }
       wx.hideLoading();
+    },
+    getHd(){
+      wx.showLoading({
+        mask: true,
+        title: '加载中'
+      });
+       getIndexData().then(res => {
+         console.log(res,'---')
+         if (res.status === '200') {
+           // 设置首页数据
+           this.setIndexData(res.data)
+         }
+       });
+    },
+    checkLogin(){
+      checkLogin().then(res => {
+        if (res.status === '200') {
+          this.getOrderList()
+          this.isLogin = true
+        } else {
+          this.isLogin = false
+        }
+      });
+    },
+    toLogin(){
+      wx.navigateTo({
+        url: '/pages/login/main'
+      });
+    },
+    toViewOrder(){
+      wx.navigateTo({
+        url: '/pages/order/main'
+      });
     }
   },
   onLoad() {
     this.checekAppUpdate()
   },
   onShow() {
-    wx.showLoading({
-      mask: true,
-      title: '加载中'
-    });
-    // 从缓存获取数据
-    let rollads = storage.get('rollads')
-    let indexData = storage.get('indexData')
-    if(rollads){
-      this.rollads = rollads
-      wx.hideLoading();
-    }else{
-      getRollAd().then(res => {
-        if (res.status === '200') {
-          let list = res.data;
-          let len = list.length;
-          this.rollads = list.slice(0,len-(len%3));
-          // 缓存
-          storage.put('rollads', this.rollads, 3)
-        }
-      });
-    }
-    if(indexData){
-      // 设置首页数据
-      this.setIndexData(indexData)
-    }else{
-      getIndexData().then(res => {
-        console.log(res,'---')
-        if (res.status === '200') {
-          // 设置首页数据
-          this.setIndexData(res.data)
-          // 缓存
-          storage.put('indexData', res.data, 3)
-        }
-      });
-    }
+    this.checkLogin()
+    this.getHd()
   },
   onShareAppMessage: function () {
 
@@ -158,31 +183,50 @@ export default {
   box-sizing: border-box;
 
   .header {
-    padding: 20rpx 55rpx;
+    padding: 20rpx;
     display: flex;
-    height: 90rpx;
-    justify-content: space-between;
+    align-items : center;
   }
 
   .header-ads {
-    font-size: 20rpx;
-  }
-
-  .header-ads .item-ad {
-    width: 285rpx;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
+    font-size: 26rpx;
+    padding : 0 20rpx;
   }
 
   .logo {
     height: 70rpx;
     width: 270rpx;
   }
-
+  .meal-title{
+    padding: 15rpx 30rpx 15rpx 20rpx;
+    background : #f8f8f8;
+    margin-top : 20rpx;
+    font-size : 34rpx;
+    display: flex;
+    align-items: center;
+    justify-content : space-between;
+    > div{
+      &:first-child{
+        display: flex;
+        align-items: center;
+        span{
+          border-left : 3px solid #ff8811;
+          height : 1em;
+          display : block;
+          padding-left : 10rpx;
+        }
+      }
+    }
+    .mores{
+      font-size : 24rpx;
+      color : #00aaff;
+      display : flex;
+      align-items : center;
+    }
+  }
   .meal-panel {
-    padding: 15rpx 55rpx;
-    font-size: 0.9em;
+    padding: 0 30rpx;
+    font-size: 32rpx;
   }
 
   .meal-items {
@@ -193,26 +237,23 @@ export default {
   }
 
   .meal-items + .meal-items {
-    border-top: 1px solid #e9eaec;
+    border-top: 1px solid #f8f8f8;
   }
 
   .item-title {
     display: flex;
     align-items: center;
-    font-size: 18px;
+    font-size: 34rpx;
   }
 
   .item-title .tag {
     display: inline-block;
-    margin-left: 10px;
-    background-color: #ed3f14;
-    font-size: 0.6em;
+    margin-left: 5px;
+    background-color: #ff8811;
+    border-radius: 30px;
+    font-size: 20rpx;
     color: #fff;
-    padding: 0 10px 2px 10px;
-  }
-
-  .item-desc {
-    font-size: 0.6em;
+    padding: 0 5px 2px 5px;
   }
 
   .item-right-img {
@@ -220,16 +261,22 @@ export default {
     border-radius: 50%;
     width: 80rpx;
     height: 80rpx;
-    padding: 5rpx;
-  }
-
-  .ad-panel {
-    padding: 15rpx 60rpx;
   }
 
-  .ad-img {
-    width: 100%;
-    height: 135rpx;
+  .noLogin{
+    font-size : 28rpx;
+    text-align : center;
+    padding: 30rpx;
+    > div{
+      padding : 10rpx 0;
+    }
+    span{
+      width : 40%;
+      padding : 15rpx;
+      border: 1px solid #eee;
+      border-radius : 6rpx;
+      display : inline-block;
+    }
   }
 }
 </style>

+ 3 - 5
src/pages/member/index.vue

@@ -17,9 +17,6 @@
         <van-cell size="large" is-link title="我的订单" url="/pages/order/main">
           <van-icon slot="icon" class="title-icon" name="balance-list" />
         </van-cell>
-        <!-- <van-cell size="large" is-link title="洗车机" @click="getCode">
-          <van-icon slot="icon" class="title-icon" name="graphic" />
-        </van-cell> -->
         <van-cell size="large" is-link title="联系客服" @click="callPhone">
           <van-icon slot="icon" class="title-icon" name="service" />
         </van-cell>
@@ -109,7 +106,7 @@ export default {
       if (res.status === '200') {
         this.getCoupon();
       } else {
-        wx.redirectTo({
+        wx.navigateTo({
           url: '/pages/login/main?lanuch=true&path=' + encodeURIComponent('/pages/member/main')
         });
       }
@@ -126,6 +123,7 @@ export default {
 <style lang="stylus" scoped>
 .container {
   padding: 15rpx 40rpx;
+  font-size : 14px;
 }
 
 .header {
@@ -149,7 +147,7 @@ export default {
     display: flex;
     align-items: center;
     font-size: 1.4em;
-    color: #ed3f14;
+    color: #ff8811;
     margin-right: 25rpx;
   }
 }

+ 3 - 3
src/pages/orderDetail/index.vue

@@ -29,7 +29,7 @@
           <van-cell :title="item.itemName" v-for="item in customerBundleItemList" :key="item.id" :id='item.id' is-link @click="subscribeMessage">
             <div class="package-qr">
               <span>剩余{{item.remainTimes}}次</span>
-              <van-icon class="icon-qr" size="1.5em" name="qr" color="#f44" />
+              <van-icon class="icon-qr" size="1.5em" name="qr" color="#ff5500" />
             </div>
           </van-cell>
         </van-cell-group>
@@ -304,7 +304,7 @@ export default {
     padding: 15rpx 0;
 
     .title {
-      color: #f44;
+      color: #ff5500;
       font-weight: bold;
       font-size: 1.2em;
       padding-bottom: 10rpx;
@@ -389,7 +389,7 @@ export default {
     margin-top: 10rpx;
 
     .price {
-      color: #f44;
+      color: #ff5500;
       font-weight: bold;
     }
   }

+ 1 - 1
src/pages/placeOrder/index.vue

@@ -363,7 +363,7 @@ export default {
     }
 
     .text-red {
-      color: #f44;
+      color: #ff5500;
     }
   }
 

+ 14 - 13
src/pages/store/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="container store-page" >
-    <div v-if="selectVal" @click="selectVal=''" class= 'modal-page'></div>
+    <div v-if="selectVal" @click="selectVal=''" class='modal-page'></div>
     <div class="store-toolbar">
       <div class="toolbar">
         <div class="item item1" @click="selectItem()">
@@ -12,7 +12,7 @@
           <van-icon class="icon" :name="selectVal==='area' ? 'arrow-up': 'arrow-down' " />
         </div>
         <div>
-          <van-icon name="search" @click="openSearch" style="font-size: 30px; font-weight: 600;" />
+          <van-icon name="search" @click="openSearch" style="font-size: 26px; font-weight: 600;" />
         </div>
       </div>
       <div class="toolbar-detail" :class="{'show': showBar}" v-show="selectVal !== ''">
@@ -25,7 +25,7 @@
           <van-button class="select-button" @click="openCitySelect" size="small" plain hairline type="info">选择其它城市</van-button>
           <van-radio-group class="checkbox-group radio-group" :value="selectKey" @change="areaChangeHandle">
             <van-radio class="radiobox-item" checked-color="red" :name="area.addrDistrict" v-for="area in areaList" :key="area.addrDistrict">
-             <van-icon v-if="currentCode && currentCode== area.addrDistrict" name="location" style="color: red; font-size: 20px;" />
+             <van-icon v-if="currentCode && currentCode== area.addrDistrict" name="location" style="color: #ff8811; font-size: 16px;" />
              {{area.addrDistrictName}}({{area.storeSum}})
             </van-radio>
           </van-radio-group>
@@ -35,7 +35,6 @@
           <van-button block class="btn" type="danger" @click="searchHandle">确定</van-button>
         </div>
       </div>
-
     </div>
     <scroll-view scroll-y class="store-content">
       <v-card style="height:auto" :thumb="item.icon" v-for="(item, index) in storeList" :key="item.id">
@@ -44,7 +43,7 @@
           <div class="content">
             <div class="left">
               <div class="desc">
-                <van-rate :value="item.star" size="10" color="#f44" allow-half void-color="#eee" void-icon="star" />
+                <van-rate :value="item.star" size="10" color="#ff8811" allow-half void-color="#eee" void-icon="star" />
                 <span class="rate-num">{{item.star}}</span>
               </div>
               <div class="phone">
@@ -63,12 +62,12 @@
             </div>
           </div>
           <div>
-            <div class="">
+            <div>
               {{item.addrProvinceName + item.addrCityName + item.addrDistrictName}}
             </div>
             <div class="tags">
               <div class="tag" v-for="(tag, index2) in item.storeBizList" :key="tag.id">{{tag.bizTypeName}}</div>
-            </div
+            </div>
           </div>
         </div>
       </v-card>
@@ -160,7 +159,7 @@ export default {
        this.currenCity = city.find(item=>{
          return item.code == code
        })
-       
+
       this.areaTitle = currenArea ? currenArea.name : this.currenCity.name
       // 获取定位或选择城市的所有区
       let arr = []
@@ -495,7 +494,7 @@ export default {
     display: flex;
     justify-content: space-around;
     height: 70rpx;
-
+    align-items: center;
     .item {
       width: 35%;
     }
@@ -504,9 +503,9 @@ export default {
       text-align: right;
     }
   }
-.red-text {
-  color : red;
-}
+  .red-text {
+    color : #ff8811;
+  }
   .toolbar-detail {
     background-color: #fff;
     position: absolute;
@@ -578,7 +577,7 @@ export default {
 
     .tag {
       color: #808695;
-      border: 1rpx solid rgba(255, 0, 0, 0.3);
+      border: 1rpx solid #ff5500;
       padding: 5rpx 10rpx;
     }
 
@@ -610,6 +609,8 @@ export default {
 .radiobox-item {
   width :100%;
   padding :10px 0;
+  display : flex;
+  align-items : center;
   border-bottom :1px solid #9999;
   .van-radio__label{
     flex-grow : 1;

+ 2 - 3
src/pages/storeSearch/index.vue

@@ -4,7 +4,7 @@
       <div class="toolbar">
         <div class="item item1" >
          <van-search
-            value="{{ value }}"
+            :value="value"
             placeholder="请输入搜索关键词"
             show-action
             shape="round"
@@ -22,9 +22,8 @@
           <div class="content">
             <div class="left">
               <div class="desc">
-                <van-rate :value="item.star" size="10" color="#f44" allow-half void-color="#eee" void-icon="star" />
+                <van-rate :value="item.star" size="10" color="#ff5500" allow-half void-color="#eee" void-icon="star" />
                 <span class="rate-num">{{item.star}}</span>
-
               </div>
               <div class="phone">
                 <van-icon name="phone" class="phone-icon" />

BIN
static/img/icon1red.png


BIN
static/img/icon2red.png


BIN
static/img/icon3black.png


BIN
static/img/icon3red.png


BIN
static/img/icon4red.png


File diff suppressed because it is too large
+ 0 - 0
static/vant/button/index.wxss


+ 1 - 1
static/vant/tabs/index.wxss

@@ -1 +1 @@
-@import '../common/index.wxss';.van-tabs{position:relative;-webkit-tap-highlight-color:transparent}.van-tabs__wrap{position:absolute;top:0;right:0;left:0;display:-webkit-flex;display:flex;background-color:#fff}.van-tabs__wrap--page-top{position:fixed}.van-tabs__wrap--content-bottom{top:auto;bottom:0}.van-tabs__wrap--scrollable .van-tab{-webkit-flex:0 0 22%;flex:0 0 22%}.van-tabs__scroll--card{border:1px solid #f44;border-radius:2px}.van-tabs__nav{position:relative;display:-webkit-flex;display:flex;-webkit-user-select:none;user-select:none}.van-tabs__nav--line{height:100%}.van-tabs__nav--card{height:30px}.van-tabs__nav--card .van-tab{line-height:30px;color:#f44;border-right:1px solid #f44}.van-tabs__nav--card .van-tab:last-child{border-right:none}.van-tabs__nav--card .van-tab.van-tab--active{color:#fff;background-color:#f44}.van-tabs__line{position:absolute;bottom:0;left:0;z-index:1;height:3px;background-color:#f44;border-radius:3px}.van-tabs--line{padding-top:44px}.van-tabs--line .van-tabs__wrap{height:44px}.van-tabs--card{padding-top:30px;margin:0 15px}.van-tabs--card .van-tabs__wrap{height:30px}.van-tabs__content{overflow:hidden}.van-tab,.van-tabs__track{position:relative}.van-tab{min-width:0;padding:0 5px;font-size:14px;line-height:44px;color:#7d7e80;text-align:center;cursor:pointer;box-sizing:border-box;-webkit-flex:1;flex:1}.van-tab--active{font-weight:500;color:#333}.van-tab--disabled{color:#c9c9c9}.van-tab__title--dot:after{display:inline-block;width:8px;height:8px;vertical-align:middle;background-color:#f44;border-radius:100%;content:""}.van-tab__title__info{position:relative!important;top:-1px!important;display:inline-block;-webkit-transform:translateX(0)!important;transform:translateX(0)!important}
+@import '../common/index.wxss';.van-tabs{position:relative;-webkit-tap-highlight-color:transparent}.van-tabs__wrap{position:absolute;top:0;right:0;left:0;display:-webkit-flex;display:flex;background-color:#fff}.van-tabs__wrap--page-top{position:fixed}.van-tabs__wrap--content-bottom{top:auto;bottom:0}.van-tabs__wrap--scrollable .van-tab{-webkit-flex:0 0 22%;flex:0 0 22%}.van-tabs__scroll--card{border:1px solid #ff5500;border-radius:2px}.van-tabs__nav{position:relative;display:-webkit-flex;display:flex;-webkit-user-select:none;user-select:none}.van-tabs__nav--line{height:100%}.van-tabs__nav--card{height:30px}.van-tabs__nav--card .van-tab{line-height:30px;color:#ff5500;border-right:1px solid #ff5500}.van-tabs__nav--card .van-tab:last-child{border-right:none}.van-tabs__nav--card .van-tab.van-tab--active{color:#fff;background-color:#ff5500}.van-tabs__line{position:absolute;bottom:0;left:0;z-index:1;height:3px;background-color:#ff5500;border-radius:3px}.van-tabs--line{padding-top:44px}.van-tabs--line .van-tabs__wrap{height:44px}.van-tabs--card{padding-top:30px;margin:0 15px}.van-tabs--card .van-tabs__wrap{height:30px}.van-tabs__content{overflow:hidden}.van-tab,.van-tabs__track{position:relative}.van-tab{min-width:0;padding:0 5px;font-size:14px;line-height:44px;color:#7d7e80;text-align:center;cursor:pointer;box-sizing:border-box;-webkit-flex:1;flex:1}.van-tab--active{font-weight:500;color:#333}.van-tab--disabled{color:#c9c9c9}.van-tab__title--dot:after{display:inline-block;width:8px;height:8px;vertical-align:middle;background-color:#ff5500;border-radius:100%;content:""}.van-tab__title__info{position:relative!important;top:-1px!important;display:inline-block;-webkit-transform:translateX(0)!important;transform:translateX(0)!important}

Some files were not shown because too many files changed in this diff