Handy_Cao 2 jaren geleden
bovenliggende
commit
c45ee070a2

+ 1 - 1
GuangZuan/miniprogram/config/index.ts

@@ -1,5 +1,5 @@
 export const appConfig = {
-  version: '1.0.0',
+  version: '1.0.01',
   apiUrl: 'http://218.17.158.45:23015/cfg?key=test_gzzs',
   imgUrl: 'http://218.17.158.45:23012/mtp2-onlineopen/uploadFile/gz/'
 }

+ 2 - 2
GuangZuan/miniprogram/mHome/pages/jewelry/list/index.less

@@ -42,8 +42,8 @@ Page {
 
     .goods-price {
       font-size: 16px;
-      color: orange;
-      margin: 10px 0px 20px 10px;
+      color: #F55656;
+      margin: 10px 0px 10px 10px;
     }
   }
 }

+ 3 - 3
GuangZuan/miniprogram/mHome/pages/jewelry/list/index.wxml

@@ -14,10 +14,10 @@
 
 <!-- 商品卡片 -->
 <view class="goodscard" style="padding-bottom: {{ safeBottom }}px;">
-  <view class="goodscard-item" wx:for="{{sellOrders}}" wx:for-item="itm" wx:for-index="idx" wx:key="idx" data-num="{{ idx }}" bindtap="onItemClick">
+  <view class="goodscard-item" wx:for="{{ sellOrders }}" wx:for-item="itm" wx:for-index="idx" wx:key="idx" data-num="{{ idx }}" bindtap="onItemClick">
     <image class="goods-icon" mode="widthFix" src="https://img.yzcdn.cn/vant/cat.jpeg"></image>
-    <text class="goods-title">{{itm.zsstyletypedisplay}}{{itm.totalqty}}ct{{itm.stonedesc}}</text>
-    <text class="goods-price">{{ itm.price }}</text>
+    <text class="goods-title">{{ itm.zsstyletypedisplay }}{{ itm.totalqty }}ct{{ itm.stonedesc }}</text>
+    <text class="goods-price">{{ itm.zscurrencytypedisplayunit }}{{ itm.price }}</text>
   </view>
 </view>
 

+ 5 - 2
GuangZuan/miniprogram/pages/home/index.less

@@ -25,9 +25,12 @@
   .banner {
     height: 210px;
     width: 92%;
-    border-radius: 10px;
 
-    .swiper-item, image {
+    .swiper-item {
+      image {
+        width: 100%;
+        border-radius: 10px;
+      }
       width: 100%;
     }
   }

+ 13 - 46
GuangZuan/miniprogram/pages/home/index.ts

@@ -11,6 +11,7 @@ Page({
    * 页面的初始数据
    */
   data: {
+    imgUrl: appConfig.imgUrl,
     /// 底部安全区域
     safeBottom: getApp().globalData.safeBottom,
     /// 窗口高度
@@ -18,24 +19,24 @@ Page({
     /// banner轮播图
     banners: [''],
     /// 功能菜单
-    menus: [{id: 1, icon: appConfig.imgUrl+'home-gpdt', title: '挂牌大厅', path: '/pages/trade/index'}, 
-            {id: 2, icon: appConfig.imgUrl+'home-ss', title: '钻石首饰', path: '/mHome/pages/jewelry/list/index'},
-            {id: 3, icon: appConfig.imgUrl+'home-cjjc', title: '出境检测', path: '/mHome/pages/inspection/list/index'}, 
-            {id: 4, icon: appConfig.imgUrl+'home-bsfw', title: '保税服务', path: '/mHome/pages/bond/list/index'}, 
-            {id: 5, icon: appConfig.imgUrl+'home-bscyw', title: '保税仓业务', path: ''}, 
-            {id: 6, icon: appConfig.imgUrl+'home-zsss', title: '钻石搜索', path: '/mHome/pages/search/index'}, 
-            {id: 7, icon: appConfig.imgUrl+'home-jsq', title: '钻石计算器', path: '/mHome/pages/calculator/index'}, 
-            {id: 8, icon: appConfig.imgUrl+'home-zscx', title: '证书查询', path: '/mHome/pages/cerserach/index'}, 
-            {id: 9, icon: appConfig.imgUrl+'home-jjjy', title: '竞价交易', path: ''}, 
-            {id: 10, icon: appConfig.imgUrl+'home-cnys', title: '产能预售', path: ''}, 
-            {id: 11, icon: appConfig.imgUrl+'home-jcjy', title: '集采交易', path: ''}],
+    menus: [{id: 1,  icon: 'home-gpdt',  title: '挂牌大厅',   path: '/pages/trade/index'}, 
+            {id: 2,  icon: 'home-ss',    title: '钻石首饰',   path: '/mHome/pages/jewelry/list/index'},
+            {id: 3,  icon: 'home-cjjc',  title: '出境检测',   path: '/mHome/pages/inspection/list/index'}, 
+            {id: 4,  icon: 'home-bsfw',  title: '保税服务',   path: '/mHome/pages/bond/list/index'}, 
+            {id: 5,  icon: 'home-bscyw', title: '保税仓业务', path: ''}, 
+            {id: 6,  icon: 'home-zsss',  title: '钻石搜索',   path: '/mHome/pages/search/index'}, 
+            {id: 7,  icon: 'home-jsq',   title: '钻石计算器', path: '/mHome/pages/calculator/index'}, 
+            {id: 8,  icon: 'home-zscx',  title: '证书查询',   path: '/mHome/pages/cerserach/index'}, 
+            {id: 9,  icon: 'home-jjjy',  title: '竞价交易',   path: ''}, 
+            {id: 10, icon: 'home-cnys',  title: '产能预售',   path: ''}, 
+            {id: 11, icon: 'home-jcjy',  title: '集采交易',   path: ''}],
     /// 统计
     statistics: { top: [{id: 1, title: '出售中', value: 0, class: ''}], rate: '' },
     /// tabs
     tabs:[{id: 1, title: '公告'}, {id: 2, title: '消息'}],
     /// 公告消息
     notice: {},
-    /// 公告系XO
+    /// 公告消息
     msgs: [{}],
     /// 会员信息
     members: [{}],
@@ -161,24 +162,6 @@ Page({
     })
   },
 
-  /**
-   * 计算器跳转
-   */
-  goToCalculator() {
-    wx.navigateTo({
-      url: '/mHome/pages/calculator/index'
-    })
-  },
-
-  /**
-   * 证书查询
-   */
-  goToCerserach() {
-    wx.navigateTo({
-      url: '/mHome/pages/cerserach/index'
-    })
-  },
-
   /// 进入公告消息详情页
   goToMsgDetail(r: any) {
     let jsonStr = JSON.stringify(this.data.msgs[r.currentTarget.id])
@@ -187,22 +170,6 @@ Page({
     })
   },
 
-  /// onGirdClick
-  onGirdClick(e: any) {
-    switch (e.currentTarget.id) {
-      case "1":
-        wx.switchTab({
-          url: e.currentTarget.dataset.url
-        })
-        break;
-      default:  /// 其他页面跳转
-        wx.navigateTo({
-          url: e.currentTarget.dataset.url
-        })
-        break;
-    }
-  },
-
   /**
    * 生命周期函数--监听页面加载
    */

+ 10 - 10
GuangZuan/miniprogram/pages/home/index.wxml

@@ -1,5 +1,3 @@
-
-
 <!-- 头部视图 -->
 <view class="top-view" style="position: sticky; top: 0; z-index: 999;"> 
   <!-- 导航栏 -->
@@ -8,15 +6,15 @@
 
 <scroll-view style="padding-bottom: 80px; background-color: #f0f0f0;" scroll-y>
   <!-- banner视图 -->
-  <view class="banner-bg" style="background-image: url('http://218.17.158.45:23012/mtp2-onlineopen/uploadFile/gz/home_banner_bg.png'); background-size: 100% 100%;">
+  <view class="banner-bg" style="background-image: url('{{ imgUrl }}home_banner_bg.png'); background-size: 100% 100%;">
     <view class="banner-bg__top" style="padding: 5px 0px;">
-      <image style="width: 40%;" mode="widthFix" src="http://218.17.158.45:23012/mtp2-onlineopen/uploadFile/gz/home_logo.png">logo</image>
+      <image style="width: 40%;" mode="widthFix" src="{{ imgUrl+'home_logo.png'}}">logo</image>
     </view>
     <!-- banner轮播图 -->
     <swiper class="banner" wx:if="{{ banners.count != 0 }}" indicator-active-color="orange" indicator-dots autoplay interval="5000" circular>
       <swiper-item class="banner_item" wx:for="{{ banners }}" wx:key="index" id="{{ item }}">
-        <view class="swiper-item">
-          <image src='{{ item }}' style="border-radius: 10px;" mode="widthFix"></image>
+        <view class="swiper-item" style="border-radius: 10px;">
+          <image src='{{ item }}' mode="scaleToFill"></image>
         </view>
       </swiper-item>
     </swiper>
@@ -38,12 +36,14 @@
   <view style="background-color: #fff;">
     <!-- 功能菜单 -->
     <van-grid column-num="4" border="{{ false }}" icon-size="{{ 40 }}">
-      <van-grid-item content-class ="van-grid-item" wx:for="{{ menus }}" wx:key="id" wx:for-index="idx" wx:for-item="itm" id="{{ itm.id }}" url="{{ itm.path }}" text="{{ itm.title }}" icon="{{ itm.icon }}.png" link-type="{{ itm.id === 1 ? 'switchTab' : 'navigateTo' }}"/>
+      <van-grid-item content-class ="van-grid-item" wx:for="{{ menus }}" wx:key="id" wx:for-index="idx" wx:for-item="itm" id="{{ itm.id }}" url="{{ itm.path }}" text="{{ itm.title }}" icon="{{ imgUrl+itm.icon }}.png" link-type="{{ itm.id === 1 ? 'switchTab' : 'navigateTo' }}"/>
     </van-grid>
   </view>
 
+  <view wx:if="{{ msgs.length != 0 }}" style="background-color: #f0f0f0; width: 100%; height: 15px;"></view>
+
   <!-- 通知栏 -->
-  <van-notice-bar wx:if="{{ msgs.length != 0 }}" left-icon="volume-o" mode="link" bind:click="goToMsg" color="#333" background="#f3f3f3" text="{{ notice.title }}" scrollable />
+  <van-notice-bar wx:if="{{ msgs.length != 0 }}" left-icon="volume-o" mode="link" bind:click="goToMsg" color="#333" background="#fff" text="{{ notice.title }}" scrollable />
 
   <view style="background-color: #f0f0f0; width: 100%; height: 15px;"></view>
 
@@ -65,8 +65,8 @@
             <text class="tag">{{ itm.membertags }}</text>
           </view>
           <view class="memberinfo__list__item__right__btm">
-            <text class="mobile">电话: {{ itm.contactphone }}</text>
-            <text class="wechat">微信: {{ itm.contactwx }}</text>
+            <text class="mobile" user-select>电话: {{ itm.contactphone }}</text>
+            <text class="wechat" user-select>微信: {{ itm.contactwx }}</text>
           </view>
         </view>
       </view>

+ 1 - 0
GuangZuan/miniprogram/pages/mine/index.ts

@@ -10,6 +10,7 @@ Page({
    * 页面的初始数据
    */
   data: {
+    imgUrl: appConfig.imgUrl,
     // 功能菜单项
     menulists: [{id: 1, title: '我的库存', img: appConfig.imgUrl+'mine-wdkc', path: '/mMine/pages/myinventorys/list/index'}, 
                 {id: 2, title: "我的订单", img: appConfig.imgUrl+'mine-wddd',  path: '/mMine/pages/myorders/list/index'}, 

+ 3 - 1
GuangZuan/miniprogram/pages/mine/index.wxml

@@ -38,6 +38,8 @@
     </view>
   </view>
 
+  <view style="background-color: #f0f0f0; height: 10px;"></view>
+
   <!-- 功能菜单项 -->
   <van-grid column-num="5" wx:if="{{ menulists.count != 0 }}">
     <van-grid-item wx:for="{{ menulists }}" wx:key="id" wx:for-index="idx" wx:for-item="itm" id="{{ itm.id }}" link-type="navigateTo" url="{{ itm.path }}">
@@ -46,7 +48,7 @@
     </van-grid-item>
   </van-grid>
 
-  <view style="background-color: #f0f0f0; height: 20px;"></view>
+  <view style="background-color: #f0f0f0; height: 10px;"></view>
 
   <!-- 列表菜单项 -->
   <van-cell-group>