采购页优化

hdApp/src/admin/home/workbench.vue

@@ -77,36 +77,53 @@
     </div>
   </div>
   <view class="order-page" v-else>
-    <view class="order_list">
-      <block>
-        <block v-if="!$util.isEmpty(supplierList)">
-          <view class="list_item" v-for="(ghsInfo, index) in supplierList" :key="index">
-            <view class="store_name">
-              <image :src="ghsInfo.avatar"></image>
-              <view class="store_title" @click="enterShop(ghsInfo)">{{ghsInfo.name}}</view>
-              <view class="accumulative"></view>
-            </view>
 
-            <view :class="[ghsInfo.isOpen == 0 ? 'cg-button-rest' : 'cg-button']" @click="enterShop(ghsInfo)">买花</view>
+<view class="ghs_list_page flex-col">
+    <view class="ghs_list_area flex-col justify-end">
+
+      <template v-if="!$util.isEmpty(supplierList)">
 
-            <view class="store_btn">
-              <view class="btn_entrance" @click="pageTo({url:'/pagesPurchase/shopping'})" > 买花记录 </view>
-              <view class="btn_entrance" @click="pageTo({ url: '/admin/clear/list?ghsId='+ghsInfo.id})">结账记录</view>
-              <view class="btn_entrance" @click="pageTo({ url: '/admin/ghs/debtChange?ghsId='+ghsInfo.id})">欠款变动明细</view>
+        <view class="ghs_box flex-col justify-end" v-for="(ghsInfo, index) in supplierList" :key="index">
+          <view class="image-text_7 flex-row justify-between">
+            <view class="section_1 flex-col">
+              <image class="logo" :src="ghsInfo.avatar" @click="enterShop(ghsInfo)" />
+            </view>
+            <view class="text-group_7 flex-col justify-between" @click="enterShop(ghsInfo)">
+              <text class="text_8">{{ghsInfo.name}}</text>
+              <text class="text_9">{{ghsInfo.address}}{{ghsInfo.floor}}</text>
             </view>
-            <text v-if="ghsInfo.isOpen == 0" 
-            style="position:absolute;top:0upx;left:0upx;color:white;background-color:#CCCCCC;padding:3upx 18upx;font-size:24upx;">已休店</text>
-            <view style="position:absolute;top:275upx;font-size:36upx;text-align:center;width:100vw;color:red;font-weight:bold;" @click="settleAccounts(ghsInfo)" v-if="Number(ghsInfo.debtAmount)>0"
-            >待结 {{ghsInfo.debtNum}}笔 {{ghsInfo.debtAmount?parseFloat(ghsInfo.debtAmount):0}}元 <text style="text-decoration:underline;margin-left:18upx;">查看明细</text></view>
           </view>
-        </block>
-        <block v-else>
-          <AppWrapperEmpty title="暂无供货商" :is-empty="$util.isEmpty(supplierList)" />
-        </block>
+          <view class="box_4 flex-col"></view>
+          <view class="box_9">
+            <view class="tag_2" @click="pageTo({url:'/pagesPurchase/shopping'})"> <text>买花记录</text> </view>
+            <view class="tag_2" @click="pageTo({ url: '/admin/clear/list?ghsId='+ghsInfo.id})"> <text>结账记录</text> </view>
+            <view class="tag_2" @click="pageTo({ url: '/admin/ghs/debtChange?ghsId='+ghsInfo.id})"> <text>欠款变动记录</text> </view>
+          </view>
+          <view class="box_6 flex-row" @click="settleAccounts(ghsInfo)" v-if="Number(ghsInfo.debtAmount)>0">
+            <view class="show_clear_area flex-row justify-between">
+              <image class="icon_2" referrerpolicy="no-referrer" src="/static/lanhu_020105gongyingshangliebiao/ps2pvfa1l5i34w5vqj2k7b3kejml3i3nmrba1421bf-caa2-491b-8773-af413df7e96d.png" />
+              <text class="waite_clear_order">待结订单&nbsp;{{ghsInfo.debtNum}}笔&nbsp;¥{{ghsInfo.debtAmount?parseFloat(ghsInfo.debtAmount):0}}</text>
+            </view>
+            <view class="image-text_9 flex-row justify-between">
+              <text class="text-group_4">查看明细</text>
+              <image class="icon_3" referrerpolicy="no-referrer" src="/static/lanhu_020105gongyingshangliebiao/ps83ag7scu3a8bfq22ciodg5hiu0x9cesxjbfb4c9ca-ee3f-45ec-a6d7-6f166e13d6e6.png" />
+            </view>
+          </view>
+          <view class="button_4 flex-col" @click="enterShop(ghsInfo)"><text class="text_13">买花</text></view>
+        </view>
+
+      </template>
+      <block v-else>
+        <AppWrapperEmpty title="暂无供货商" :is-empty="$util.isEmpty(supplierList)" />
       </block>
+
     </view>
   </view>
 
+
+
+  </view>
+
   </block>
 </view>
 </template>
@@ -509,158 +526,277 @@ export default {
   }
 }
 .order-page {
-  .order_list {
-    height: 100%;
-    background: #f0f2f6;
-    padding: 0 0 20upx;
-    margin-bottom:100upx;
-    padding-top:4upx;
-    .list_item {
-      margin: 20upx 0 0;
-      position: relative;
-      height: 380upx;
-      width: 100vw;
-      background: #fff;
+.ghs_list_page {
+  background-color: rgba(255, 255, 255, 1);
+  position: relative;
+  width: 750upx; 
+  overflow: hidden;
+  .flex-col {
+    display: flex;
+    flex-direction: column;
+  }
+  .flex-row {
+    display: flex;
+    flex-direction: row;
+  }
+  .justify-start {
+      display: flex;
+      justify-content: flex-start;
+    }
+  .justify-center {
+      display: flex;
+      justify-content: center;
+  }
+    
+  .justify-end {
+      display: flex;
+      justify-content: flex-end;
+  }
+  .justify-evenly {
+      display: flex;
+      justify-content: space-evenly;
+  }
+  .justify-around {
+      display: flex;
+      justify-content: space-around;
+  }
+  .justify-between {
+      display: flex;
+      justify-content: space-between;
+  }
+  .align-start {
+      display: flex;
+      align-items: flex-start;
+  }
+  .align-center {
       display: flex;
       align-items: center;
-      .dist{
-        position: absolute;
-        top:0upx;
-        left: 0upx;
-        width:110upx;
-        text-align:center;
-        height:30upx;
-        background:#ecebeb;
-        font-size:22upx;
-        color:white;
-      }
-      .debt-amount{
-        color:red;
-        position: absolute;
-        top:75upx;
-        font-size:26upx;
-        right:260upx;
-      }
-      .cg-button{
-          display: inline-block;
-          font-size: 33upx;
-          font-weight:bold;
-          color: white;
-          border: 1px solid #3385FF;
-          border-radius: 45upx;
-          padding: 20upx 40upx;
-          position: absolute;
-          top:56upx;
-          right:60upx;
-          background: #3385FF;
-      }
-      .cg-button-rest{
-          display: inline-block;
-          font-size: 33upx;
-          font-weight:bold;
-          color: white;
-          border: 1px solid #CCCCCC;
-          border-radius: 45upx;
-          padding: 20upx 40upx;
-          position: absolute;
-          top:56upx;
-          right:60upx;
-          background: #CCCCCC;
-      }
-      .book-button{
-          display: inline-block;
-          font-size: 25upx;
-          border-radius: 120upx;
-          padding: 15upx 30upx;
-          position: absolute;
-          top:250upx;
-          right:300upx;
-      }
-      .could-book{
-          color: white;
-          border: 1px solid #657cac;
-          background: #657cac;
+  }
+  .align-end {
+      display: flex;
+      align-items: flex-end;
+  }
+
+  .ghs_list_area {
+    width: 750upx;
+    background-color: #ece5e5;
+    .group_1 {
+      box-shadow: 0px 1px 0px 0px rgba(221, 221, 221, 1);
+      background-color: rgba(255, 255, 255, 1);
+      width: 750upx;
+      height: 128upx;
+      margin-top: 2upx;
+      .image_1 {
+        width: 727upx;
+        height: 20upx;
+        margin: 11upx 0 0 12upx;
       }
-      .not-book{
-          color: white;
-          border: 1px solid #CCCCCC;
-          background: #CCCCCC;
+      .block_4 {
+        width: 714upx;
+        height: 64upx;
+        margin: 21upx 0 12upx 24upx;
+        .icon_1 {
+          width: 20upx;
+          height: 34upx;
+          margin-top: 16upx;
+        }
+        .text_1 {
+          width: 107upx;
+          height: 34upx;
+          overflow-wrap: break-word;
+          color: rgba(4, 4, 4, 1);
+          font-size: 36upx;
+          font-family: PingFangSC-Semibold;
+          text-align: left;
+          white-space: nowrap;
+          line-height: 24upx;
+          margin: 15upx 0 0 278upx;
+        }
+        .applet-top-bar_1 {
+          width: 174upx;
+          height: 64upx;
+          margin-left: 135upx;
+        }
       }
-      .book-button-text{
-          position: absolute;
-          top:330upx;
-          right:210upx;
-          .explain{
-            text-decoration: underline;
-            font-size:25upx;
+    }
+    .ghs_box {
+      background-color: rgba(255, 255, 255, 1);
+      position: relative;
+      width: 750upx;
+      height: auto;
+      margin-bottom:35upx;
+      .image-text_7 {
+        width: 674upx;
+        height: 120upx;
+        margin: 40upx 0 0 31upx;
+        .section_1 {
+          width: 120upx;
+          height: 120upx;
+          .logo{
+            width:120upx;
+            height:120upx;
+            border-radius:10upx;
           }
+        }
+        .text-group_7 {
+          width: 533upx;
+          height: 99upx;
+          margin-top: 5upx;
+          .text_8 {
+            display:inline-block;
+            width: 458upx;
+            height: 38upx;
+            color: rgba(51, 51, 51, 1);
+            font-size: 36upx;
+            font-weight:bold;
+            text-align: left;
+            white-space: nowrap;
+            line-height:38upx;
+            overflow:hidden;
+            text-overflow:ellipsis;
+          }
+          .text_9 {
+            width: 533upx;
+            height: 25upx;
+            overflow-wrap: break-word;
+            color: rgba(153, 153, 153, 1);
+            font-size: 26upx;
+            text-align: left;
+            white-space: nowrap;
+            line-height: 24upx;
+            margin-top: 10upx;
+          }
+        }
       }
-      .could-book-text{
-          color:#666666;
-      }
-      .not-book-text{
-        color:#CCCCCC;
+      .box_4 {
+        background-color: rgba(238, 238, 238, 1);
+        width: 750upx;
+        height: 1upx;
+        margin-top: 40upx;
       }
-      & > .store_name {
-        margin-left: 30upx;
-        width: 700upx;
-        display: block;
-        position: absolute;
-        top:70upx;
-        left: 0upx;
-        image{
-          width:50upx;
-          height:50upx;
-          border-radius:60upx;
+      .box_9 {
+        width: 100%;
+        height: 60upx;
+        margin: 23upx 0 22upx 30upx;
+        .tag_2 {
+          background-color: rgba(255, 255, 255, 1);
+          border-radius: 8px;
+          height: 60upx;
+          line-height:60upx;
+          border: 1px solid rgba(221, 221, 221, 1);
+          color: rgba(51, 51, 51, 1);
+          font-size: 30upx;
+          margin:0 25upx 0 0;
+          text-align:center;
           float:left;
+          padding-left:15upx;
+          padding-right:15upx;
         }
-        & > .store_title {
-          margin-bottom: 58upx;
-          margin-left:10upx;
-          width: 486upx;
-          white-space: nowrap;
-          text-overflow: ellipsis;
-          overflow: hidden;
-          word-break: break-all;
-          font-size: 36upx;
-          font-weight: 700;
-          color: #333;
-          display:inline-block;
+        .tag_3 {
+          background-color: rgba(255, 255, 255, 1);
+          border-radius: 8px;
+          height: 60upx;
+          border: 1px solid rgba(221, 221, 221, 1);
+          margin-left: 12upx;
+          width: 140upx;
+          .text_11 {
+            width: 101upx;
+            height: 25upx;
+            overflow-wrap: break-word;
+            color: rgba(51, 51, 51, 1);
+            font-size: 26upx;
+            text-align: left;
+            white-space: nowrap;
+            line-height: 25upx;
+            margin: 17upx 0 0 20upx;
+          }
         }
-        & > .accumulative {
-          font-size: 26upx;
-          color: #999;
+        .tag_4 {
+          background-color: rgba(255, 255, 255, 1);
+          border-radius: 8px;
+          height: 60upx;
+          border: 1px solid rgba(221, 221, 221, 1);
+          margin-left: 12upx;
+          width: 192upx;
+          .text_12 {
+            width: 153upx;
+            height: 25upx;
+            overflow-wrap: break-word;
+            color: rgba(51, 51, 51, 1);
+            font-size: 26upx;
+            text-align: left;
+            white-space: nowrap;
+            line-height: 25upx;
+            margin: 17upx 0 0 18upx;
+          }
         }
       }
-      & > .store_btn {
-        position: absolute;
-        top:180upx;
-        left: 0upx;
-        & > .btn_entrance {
-          display: inline-block;
-          font-size: 35upx;
-          color: #BBBBBB;
-          padding: 10upx 10upx;
-          margin-left: 45upx;
-          text-decoration: underline;
-          color:#666666;
+      .box_6 {
+        background-color: rgb(248, 242, 242);
+        width: 750upx;
+        height:85upx;
+        .show_clear_area {
+          width: 247upx;
+          height: 29upx;
+          margin: 26upx 0 0 30upx;
+          .icon_2 {
+            width: 22upx;
+            height: 26upx;
+            margin-top: 2upx;
+          }
+          .waite_clear_order {
+            width: 214upx;
+            height: 29upx;
+            overflow-wrap: break-word;
+            color: rgba(255, 40, 66, 1);
+            font-size: 30upx;
+            font-weight:bold;
+            text-align: left;
+            white-space: nowrap;
+            line-height: 29upx;
+          }
+        }
+        .image-text_9 {
+          width: 134upx;
+          height: 27upx;
+          margin: 26upx 29upx 0 310upx;
+          .text-group_4 {
+            width: 111upx;
+            height: 27upx;
+            overflow-wrap: break-word;
+            color: rgba(255, 40, 66, 1);
+            font-size: 30upx;
+            font-weight:bold;
+            text-align: left;
+            white-space: nowrap;
+            line-height: 27upx;
+          }
+          .icon_3 {
+            width: 14upx;
+            height: 24upx;
+            margin-top: 2upx;
+          }
         }
       }
-      .fl_line {
+      .button_4 {
+        height: 80upx;
+        line-height:80upx;
+        text-align:center;
+        background-color:#3385FF;
+        background-size: 137upx 137upx;
+        width: 130upx;
         position: absolute;
-        top:120upx;
-        left: 40upx;
-        font-size:23upx;
-        color:red;
-        text{
-          margin-right:40upx;
+        left: 600upx;
+        top: 80upx;
+        border-radius:39upx;
+        .text_13 {
+          color: rgba(255, 255, 255, 1);
+          font-size: 30upx;
+          font-weight:bold;
         }
       }
     }
   }
-  .pay_list {
-    padding-top: 20upx;
-    background-color: #f0f2f6;
-  }
+}
 }
 </style>

hdApp/src/config.js

@@ -1,4 +1,4 @@
 export const ProjectName = 'hd'
-export const APIHOST = 'https://api.shop.huaml.com'
-export const IMGHOST = 'https://img.huaml.com'
-export const CURRENT_ENV = 'dev'
+export const APIHOST = 'https://api.shop.huahb.cn'
+export const IMGHOST = 'https://img.huahb.cn'
+export const CURRENT_ENV = 'production'

hdApp/src/ext.json

@@ -1,12 +1,12 @@
 {
   "extEnable": true,
-  "extAppid": "wxe4675bab299a52f7",
+  "extAppid": "wx0d42f5f1dcb3a370",
   "directCommit": false,
   "ext": {
-    "account": 12362,
-    "apiHost": "https://api.shop.huaml.com",
-    "socketApiHost": "api.shop.huaml.com",
-    "imgHost": "https://img.huaml.com",
-    "name":"花美玲"
+    "account": 12358,
+    "apiHost": "https://api.shop.huahb.cn",
+    "socketApiHost": "api.shop.huahb.cn",
+    "imgHost": "https://img.huahb.cn",
+    "name":"花掌柜"
   }
 }

hdApp/src/manifest.json

@@ -2,8 +2,8 @@
     "name" : "花掌柜",
     "appid" : "__UNI__4079DC1",
     "description" : "花店管家婆",
-    "versionName" : "1.1.4",
-    "versionCode" : 114,
+    "versionName" : "1.1.8",
+    "versionCode" : 118,
     "transformPx" : true,
     /* 5+App特有相关 */
     "app-plus" : {
@@ -93,7 +93,7 @@
                     "entitlements" : {
                         "com.apple.developer.associated-domains" : [ "applinks:fronttg.huahb.cn" ]
                     }
-                }           
+                }
             },
             /* SDK配置 */
             "sdkConfigs" : {
@@ -186,7 +186,7 @@
     "quickapp" : {},
     /* 小程序特有相关 线上（花掌柜） wx0d42f5f1dcb3a370 开发（花美玲） wxe4675bab299a52f7 */
     "mp-weixin" : {
-        "appid" : "wxe4675bab299a52f7",
+        "appid" : "wx0d42f5f1dcb3a370",
         "setting" : {
             "urlCheck" : false
         },

hdApp/src/pagesPurchase/order.vue

@@ -1,32 +1,43 @@
 <template>
-  <view class="order-page">
-    <view class="order_list">
-      <block>
-        <block v-if="!$util.isEmpty(supplierList)">
-          <view class="list_item" v-for="(ghsInfo, index) in supplierList" :key="index">
-            <view class="store_name">
-              <image :src="ghsInfo.avatar"></image>
-              <view class="store_title" @click="enterShop(ghsInfo)">{{ghsInfo.name}}</view>
-              <view class="accumulative"></view>
-            </view>
+  <view class="ghs_list_page flex-col">
+    <view class="ghs_list_area flex-col justify-end">
 
-            <view :class="[ghsInfo.isOpen == 0 ? 'cg-button-rest' : 'cg-button']" @click="enterShop(ghsInfo)">买花</view>
+      <template v-if="!$util.isEmpty(supplierList)">
 
-            <view class="store_btn">
-              <view class="btn_entrance" @click="pageTo({url:'/pagesPurchase/shopping'})" > 买花记录 </view>
-              <view class="btn_entrance" @click="pageTo({ url: '/admin/clear/list?ghsId='+ghsInfo.id})">结账记录</view>
-              <view class="btn_entrance" @click="pageTo({ url: '/admin/ghs/debtChange?ghsId='+ghsInfo.id})">欠款变动明细</view>
+        <view class="ghs_box flex-col justify-end" v-for="(ghsInfo, index) in supplierList" :key="index">
+          <view class="image-text_7 flex-row justify-between">
+            <view class="section_1 flex-col">
+              <image class="logo" :src="ghsInfo.avatar" @click="enterShop(ghsInfo)" />
+            </view>
+            <view class="text-group_7 flex-col justify-between" @click="enterShop(ghsInfo)">
+              <text class="text_8">{{ghsInfo.name}}</text>
+              <text class="text_9">{{ghsInfo.address}}{{ghsInfo.floor}}</text>
             </view>
-            <text v-if="ghsInfo.isOpen == 0" 
-            style="position:absolute;top:0upx;left:0upx;color:white;background-color:#CCCCCC;padding:3upx 18upx;font-size:24upx;">已休店</text>
-            <view style="position:absolute;top:275upx;font-size:36upx;text-align:center;width:100vw;color:red;font-weight:bold;" @click="settleAccounts(ghsInfo)" v-if="Number(ghsInfo.debtAmount)>0"
-            >待结 {{ghsInfo.debtNum}}笔 {{ghsInfo.debtAmount?parseFloat(ghsInfo.debtAmount):0}}元 <text style="text-decoration:underline;margin-left:18upx;">查看明细</text></view>
           </view>
-        </block>
-        <block v-else>
-          <AppWrapperEmpty title="暂无供货商" :is-empty="$util.isEmpty(supplierList)" />
-        </block>
+          <view class="box_4 flex-col"></view>
+          <view class="box_9">
+            <view class="tag_2" @click="pageTo({url:'/pagesPurchase/shopping'})"> <text>买花记录</text> </view>
+            <view class="tag_2" @click="pageTo({ url: '/admin/clear/list?ghsId='+ghsInfo.id})"> <text>结账记录</text> </view>
+            <view class="tag_2" @click="pageTo({ url: '/admin/ghs/debtChange?ghsId='+ghsInfo.id})"> <text>欠款变动记录</text> </view>
+          </view>
+          <view class="box_6 flex-row" @click="settleAccounts(ghsInfo)" v-if="Number(ghsInfo.debtAmount)>0">
+            <view class="show_clear_area flex-row justify-between">
+              <image class="icon_2" referrerpolicy="no-referrer" src="/static/lanhu_020105gongyingshangliebiao/ps2pvfa1l5i34w5vqj2k7b3kejml3i3nmrba1421bf-caa2-491b-8773-af413df7e96d.png" />
+              <text class="waite_clear_order">待结订单&nbsp;{{ghsInfo.debtNum}}笔&nbsp;¥{{ghsInfo.debtAmount?parseFloat(ghsInfo.debtAmount):0}}</text>
+            </view>
+            <view class="image-text_9 flex-row justify-between">
+              <text class="text-group_4">查看明细</text>
+              <image class="icon_3" referrerpolicy="no-referrer" src="/static/lanhu_020105gongyingshangliebiao/ps83ag7scu3a8bfq22ciodg5hiu0x9cesxjbfb4c9ca-ee3f-45ec-a6d7-6f166e13d6e6.png" />
+            </view>
+          </view>
+          <view class="button_4 flex-col" @click="enterShop(ghsInfo)"><text class="text_13">买花</text></view>
+        </view>
+
+      </template>
+      <block v-else>
+        <AppWrapperEmpty title="暂无供货商" :is-empty="$util.isEmpty(supplierList)" />
       </block>
+
     </view>
   </view>
 </template>
@@ -73,161 +84,277 @@ export default {
   }
 }
 </script>
-
-<style lang="scss" scoped>
-.order-page {
-  .order_list {
-    height: 100%;
-    background: #f0f2f6;
-    padding: 0 0 20upx;
-    margin-bottom:100upx;
-    padding-top:4upx;
-    .list_item {
-      margin: 20upx 0 0;
-      position: relative;
-      height: 380upx;
-      width: 100vw;
-      background: #fff;
+<style lang='scss' scoped>
+.ghs_list_page {
+  background-color: rgba(255, 255, 255, 1);
+  position: relative;
+  width: 750upx; 
+  overflow: hidden;
+  .flex-col {
+    display: flex;
+    flex-direction: column;
+  }
+  .flex-row {
+    display: flex;
+    flex-direction: row;
+  }
+  .justify-start {
+      display: flex;
+      justify-content: flex-start;
+    }
+  .justify-center {
+      display: flex;
+      justify-content: center;
+  }
+    
+  .justify-end {
+      display: flex;
+      justify-content: flex-end;
+  }
+  .justify-evenly {
+      display: flex;
+      justify-content: space-evenly;
+  }
+  .justify-around {
+      display: flex;
+      justify-content: space-around;
+  }
+  .justify-between {
+      display: flex;
+      justify-content: space-between;
+  }
+  .align-start {
+      display: flex;
+      align-items: flex-start;
+  }
+  .align-center {
       display: flex;
       align-items: center;
-      .dist{
-        position: absolute;
-        top:0upx;
-        left: 0upx;
-        width:110upx;
-        text-align:center;
-        height:30upx;
-        background:#ecebeb;
-        font-size:22upx;
-        color:white;
-      }
-      .debt-amount{
-        color:red;
-        position: absolute;
-        top:75upx;
-        font-size:26upx;
-        right:260upx;
-      }
-      .cg-button{
-          display: inline-block;
-          font-size: 33upx;
-          font-weight:bold;
-          color: white;
-          border: 1px solid #3385FF;
-          border-radius: 45upx;
-          padding: 20upx 40upx;
-          position: absolute;
-          top:56upx;
-          right:60upx;
-          background: #3385FF;
-      }
-      .cg-button-rest{
-          display: inline-block;
-          font-size: 33upx;
-          font-weight:bold;
-          color: white;
-          border: 1px solid #CCCCCC;
-          border-radius: 45upx;
-          padding: 20upx 40upx;
-          position: absolute;
-          top:56upx;
-          right:60upx;
-          background: #CCCCCC;
-      }
-      .book-button{
-          display: inline-block;
-          font-size: 25upx;
-          border-radius: 120upx;
-          padding: 15upx 30upx;
-          position: absolute;
-          top:250upx;
-          right:300upx;
-      }
-      .could-book{
-          color: white;
-          border: 1px solid #657cac;
-          background: #657cac;
+  }
+  .align-end {
+      display: flex;
+      align-items: flex-end;
+  }
+
+  .ghs_list_area {
+    width: 750upx;
+    background-color: #ece5e5;
+    .group_1 {
+      box-shadow: 0px 1px 0px 0px rgba(221, 221, 221, 1);
+      background-color: rgba(255, 255, 255, 1);
+      width: 750upx;
+      height: 128upx;
+      margin-top: 2upx;
+      .image_1 {
+        width: 727upx;
+        height: 20upx;
+        margin: 11upx 0 0 12upx;
       }
-      .not-book{
-          color: white;
-          border: 1px solid #CCCCCC;
-          background: #CCCCCC;
+      .block_4 {
+        width: 714upx;
+        height: 64upx;
+        margin: 21upx 0 12upx 24upx;
+        .icon_1 {
+          width: 20upx;
+          height: 34upx;
+          margin-top: 16upx;
+        }
+        .text_1 {
+          width: 107upx;
+          height: 34upx;
+          overflow-wrap: break-word;
+          color: rgba(4, 4, 4, 1);
+          font-size: 36upx;
+          font-family: PingFangSC-Semibold;
+          text-align: left;
+          white-space: nowrap;
+          line-height: 24upx;
+          margin: 15upx 0 0 278upx;
+        }
+        .applet-top-bar_1 {
+          width: 174upx;
+          height: 64upx;
+          margin-left: 135upx;
+        }
       }
-      .book-button-text{
-          position: absolute;
-          top:330upx;
-          right:210upx;
-          .explain{
-            text-decoration: underline;
-            font-size:25upx;
+    }
+    .ghs_box {
+      background-color: rgba(255, 255, 255, 1);
+      position: relative;
+      width: 750upx;
+      height: auto;
+      margin-bottom:35upx;
+      .image-text_7 {
+        width: 674upx;
+        height: 120upx;
+        margin: 40upx 0 0 31upx;
+        .section_1 {
+          width: 120upx;
+          height: 120upx;
+          .logo{
+            width:120upx;
+            height:120upx;
+            border-radius:10upx;
           }
+        }
+        .text-group_7 {
+          width: 533upx;
+          height: 99upx;
+          margin-top: 5upx;
+          .text_8 {
+            display:inline-block;
+            width: 458upx;
+            height: 38upx;
+            color: rgba(51, 51, 51, 1);
+            font-size: 36upx;
+            font-weight:bold;
+            text-align: left;
+            white-space: nowrap;
+            line-height:38upx;
+            overflow:hidden;
+            text-overflow:ellipsis;
+          }
+          .text_9 {
+            width: 533upx;
+            height: 25upx;
+            overflow-wrap: break-word;
+            color: rgba(153, 153, 153, 1);
+            font-size: 26upx;
+            text-align: left;
+            white-space: nowrap;
+            line-height: 24upx;
+            margin-top: 10upx;
+          }
+        }
       }
-      .could-book-text{
-          color:#666666;
-      }
-      .not-book-text{
-        color:#CCCCCC;
+      .box_4 {
+        background-color: rgba(238, 238, 238, 1);
+        width: 750upx;
+        height: 1upx;
+        margin-top: 40upx;
       }
-      & > .store_name {
-        margin-left: 30upx;
-        width: 700upx;
-        display: block;
-        position: absolute;
-        top:70upx;
-        left: 0upx;
-        image{
-          width:50upx;
-          height:50upx;
-          border-radius:60upx;
+      .box_9 {
+        width: 100%;
+        height: 60upx;
+        margin: 23upx 0 22upx 30upx;
+        .tag_2 {
+          background-color: rgba(255, 255, 255, 1);
+          border-radius: 8px;
+          height: 60upx;
+          line-height:60upx;
+          border: 1px solid rgba(221, 221, 221, 1);
+          color: rgba(51, 51, 51, 1);
+          font-size: 30upx;
+          margin:0 25upx 0 0;
+          text-align:center;
           float:left;
+          padding-left:15upx;
+          padding-right:15upx;
         }
-        & > .store_title {
-          margin-bottom: 58upx;
-          margin-left:10upx;
-          width: 486upx;
-          white-space: nowrap;
-          text-overflow: ellipsis;
-          overflow: hidden;
-          word-break: break-all;
-          font-size: 36upx;
-          font-weight: 700;
-          color: #333;
-          display:inline-block;
+        .tag_3 {
+          background-color: rgba(255, 255, 255, 1);
+          border-radius: 8px;
+          height: 60upx;
+          border: 1px solid rgba(221, 221, 221, 1);
+          margin-left: 12upx;
+          width: 140upx;
+          .text_11 {
+            width: 101upx;
+            height: 25upx;
+            overflow-wrap: break-word;
+            color: rgba(51, 51, 51, 1);
+            font-size: 26upx;
+            text-align: left;
+            white-space: nowrap;
+            line-height: 25upx;
+            margin: 17upx 0 0 20upx;
+          }
         }
-        & > .accumulative {
-          font-size: 26upx;
-          color: #999;
+        .tag_4 {
+          background-color: rgba(255, 255, 255, 1);
+          border-radius: 8px;
+          height: 60upx;
+          border: 1px solid rgba(221, 221, 221, 1);
+          margin-left: 12upx;
+          width: 192upx;
+          .text_12 {
+            width: 153upx;
+            height: 25upx;
+            overflow-wrap: break-word;
+            color: rgba(51, 51, 51, 1);
+            font-size: 26upx;
+            text-align: left;
+            white-space: nowrap;
+            line-height: 25upx;
+            margin: 17upx 0 0 18upx;
+          }
         }
       }
-      & > .store_btn {
-        position: absolute;
-        top:180upx;
-        left: 0upx;
-        & > .btn_entrance {
-          display: inline-block;
-          font-size: 35upx;
-          color: #BBBBBB;
-          padding: 10upx 10upx;
-          margin-left: 45upx;
-          text-decoration: underline;
-          color:#666666;
+      .box_6 {
+        background-color: rgb(248, 242, 242);
+        width: 750upx;
+        height:85upx;
+        .show_clear_area {
+          width: 247upx;
+          height: 29upx;
+          margin: 26upx 0 0 30upx;
+          .icon_2 {
+            width: 22upx;
+            height: 26upx;
+            margin-top: 2upx;
+          }
+          .waite_clear_order {
+            width: 214upx;
+            height: 29upx;
+            overflow-wrap: break-word;
+            color: rgba(255, 40, 66, 1);
+            font-size: 30upx;
+            font-weight:bold;
+            text-align: left;
+            white-space: nowrap;
+            line-height: 29upx;
+          }
+        }
+        .image-text_9 {
+          width: 134upx;
+          height: 27upx;
+          margin: 26upx 29upx 0 310upx;
+          .text-group_4 {
+            width: 111upx;
+            height: 27upx;
+            overflow-wrap: break-word;
+            color: rgba(255, 40, 66, 1);
+            font-size: 30upx;
+            font-weight:bold;
+            text-align: left;
+            white-space: nowrap;
+            line-height: 27upx;
+          }
+          .icon_3 {
+            width: 14upx;
+            height: 24upx;
+            margin-top: 2upx;
+          }
         }
       }
-      .fl_line {
+      .button_4 {
+        height: 80upx;
+        line-height:80upx;
+        text-align:center;
+        background-color:#3385FF;
+        background-size: 137upx 137upx;
+        width: 130upx;
         position: absolute;
-        top:120upx;
-        left: 40upx;
-        font-size:23upx;
-        color:red;
-        text{
-          margin-right:40upx;
+        left: 600upx;
+        top: 80upx;
+        border-radius:39upx;
+        .text_13 {
+          color: rgba(255, 255, 255, 1);
+          font-size: 30upx;
+          font-weight:bold;
         }
       }
     }
   }
-  .pay_list {
-    padding-top: 20upx;
-    background-color: #f0f2f6;
-  }
 }
 </style>

hdApp/src/static/iconfont/iconfont.css

@@ -1,11 +1,11 @@
 @font-face {
   font-family: 'iconfont';  /* project id 1525256 */
-  src: url('https://img.huaml.com/iconfont/font_1525256_6bxwphhntqh.eot');
-  src: url('https://img.huaml.com/iconfont/font_1525256_6bxwphhntqh.eot?#iefix') format('embedded-opentype'),
-  url('https://img.huaml.com/iconfont/font_1525256_6bxwphhntqh.woff2') format('woff2'),
-  url('https://img.huaml.com/iconfont/font_1525256_6bxwphhntqh.woff') format('woff'),
-  url('https://img.huaml.com/iconfont/font_1525256_6bxwphhntqh.ttf') format('truetype'),
-  url('https://img.huaml.com/iconfont/font_1525256_6bxwphhntqh.svg#iconfont') format('svg');
+  src: url('https://img.huahb.cn/iconfont/font_1525256_6bxwphhntqh.eot');
+  src: url('https://img.huahb.cn/iconfont/font_1525256_6bxwphhntqh.eot?#iefix') format('embedded-opentype'),
+  url('https://img.huahb.cn/iconfont/font_1525256_6bxwphhntqh.woff2') format('woff2'),
+  url('https://img.huahb.cn/iconfont/font_1525256_6bxwphhntqh.woff') format('woff'),
+  url('https://img.huahb.cn/iconfont/font_1525256_6bxwphhntqh.ttf') format('truetype'),
+  url('https://img.huahb.cn/iconfont/font_1525256_6bxwphhntqh.svg#iconfont') format('svg');
 }
 
 .iconfont {