代码提交；

GuangZuan/miniprogram/app.json

@@ -50,14 +50,13 @@
       "pages": [
         "pages/settings/settings",
         "pages/myinventorys/myinventorys",
-        "pages/realauthentication/realauthentication",
+        "pages/realauth/realauth",
         "pages/storageserver/storageserver",
         "pages/tradeserver/tradeserver",
         "pages/assets/assets",
         "pages/myorders/myorders",
         "pages/myreports/myreports",
         "pages/ordersearch/ordersearch",
-        "pages/spotlisting/spotlisting",
         "pages/bank/bank",
         "pages/listingdetail/listingdetail"
       ]

GuangZuan/miniprogram/app.less

@@ -1 +1,8 @@
-/**app.wxss**/
+/**app.wxss**/
+@import '/miniprogram_npm/@vant/weapp/common/index.wxss';
+
+page {
+  font-family: -apple-system, BlinkMacSystemFont, 'Helvetica Neue', Helvetica,
+    Segoe UI, Arial, Roboto, 'PingFang SC', 'miui', 'Hiragino Sans GB', 'Microsoft Yahei',
+    sans-serif;
+}

GuangZuan/miniprogram/app.ts

@@ -5,19 +5,21 @@ App({
     /// iPhone底部安全区域
     safeBottom: 0,
     /// 窗口高度
-    windowHeight: 0
+    windowHeight: 0,
+    /// http请求的url
+    httpUrl: ''
   },
-  onLaunch() {
 
+  onLaunch() {
     /// 获取iPhone底部安全区域
     wx.getSystemInfo({
       success: res=> {
-        // console.log(res)
+        /// console.log(res)
         this.globalData.safeBottom = res.screenHeight-res.safeArea.bottom
         this.globalData.windowHeight = res.windowHeight
       },
-      fail(err) {
-        console.log(err)
+      fail: (er) => {
+        console.log(er)
       }
     })
 
@@ -29,7 +31,7 @@ App({
     // 登录
     wx.login({
       success: res => {
-        console.log(res.code)
+        console.log(res)
         // 发送 res.code 到后台换取 openId, sessionKey, unionId
       },
     })

GuangZuan/miniprogram/components/news-item/news-item.less

@@ -6,26 +6,40 @@
   height: 120px;
   align-content: center;
   align-items: center;
+  justify-content: space-between;
+  padding: 10px 0px;
 
-  image {
+  .new-img {
     height: 80px;
     margin-left: 10px;
     border-radius: 10px;
+    width: 180px;
   }
 
   .new-lists-item-left {
     display: grid;
+    width: 100%;
 
-    text:nth-child(1) {
-      width: 100%;
+    .new-title {
       font-size: 16px;
       color: #333;
     }
     
-    text:nth-child(2) {
+    .new-content {
       font-size: 13px;
       color: #666;
       margin-top: 10px;
+      /// 靠左居中
+      text-align: left;
+      /// 溢出部分隐藏
+      overflow: hidden;
+      /// 文本移除后 使用...替换
+      text-overflow: ellipsis;
+      -webkit-line-clamp: 4;
+      /* 设置或检索伸缩盒对象的子元素的排列方式 */
+      display: -webkit-box;
+      /* 设置或检索伸缩盒对象的子元素的排列方式 */
+      -webkit-box-orient: vertical;
     }
   }
 }

GuangZuan/miniprogram/components/news-item/news-item.ts

@@ -4,7 +4,21 @@ Component({
    * 组件的属性列表
    */
   properties: {
-
+    /// 新闻标题
+    title: {
+      type: String,
+      value: ""
+    },
+    /// 新闻内容
+    content: {
+      type: String,
+      value: ""
+    },
+    /// 新闻图片
+    imgUrl: {
+      type: String,
+      value: ""
+    }
   },
 
   /**

GuangZuan/miniprogram/components/news-item/news-item.wxml

@@ -1,8 +1,8 @@
 <!--components/news-item/news-item.wxml-->
 <view class="new-lists-item" bindtap="goToNews">
   <view class="new-lists-item-left">
-    <text>培育钻品牌有了新玩法</text>
-    <text>培育钻品牌有了新玩法上游技术升级和下游消费者教育走向成熟，两到三年的快速增长后走向成熟。输入框。该组件是原生组件，使用时请注意相关限制</text>
+    <text class="new-title">{{title}}</text>
+    <text class="new-content">{{content}}</text>
   </view>
-  <image src="https://img.yzcdn.cn/vant/cat.jpeg"></image>
+  <image class="new-img" src="{{imgUrl}}"></image>
 </view>

GuangZuan/miniprogram/components/num-range/num-range.less

@@ -2,28 +2,27 @@
 
 .content {
   display: flex;
-  justify-content: space-between;
-  height: 60%;
+  justify-content: space-around;
   align-items: center;
-  align-content: center;
+  height: 35px;
 }
 
-.left, .right {
-  justify-content: space-between;
-  border: 1px solid #ccc;
-  align-items: center;
-  align-content: center;
-  height: 100%;
-  border-radius: 20px;
-}
+.right, .left {
+   height: 100%;
+   display: flex;
+   border-radius: 20px;
+   align-items: center;
+   justify-content: space-between;
+   border: 1px solid #ccc;
+   display: flex;
+   padding: 0px 5px;
 
-.left text, .right text {
-  text-align: right;
-  width: 40px;
-  height: 100%;
-  padding-right: 10px;
-  background-color: blueviolet;
-  border-top-right-radius: 17.5px;
-  border-bottom-right-radius: 17.5px;
-  color: white;
-}
+   .unit {
+    text-align: center;
+    color: #333;
+    border-top-right-radius: 17.5px;
+    border-bottom-right-radius: 17.5px;
+    font-size: 12px;
+    width: 50px;
+  }
+}

GuangZuan/miniprogram/components/num-range/num-range.ts

@@ -4,7 +4,11 @@ Component({
    * 组件的属性列表
    */
   properties: {
-
+    /// 单位
+    unit: {
+      type: String,
+      value: 'CT'
+    }
   },
 
   /**

GuangZuan/miniprogram/components/num-range/num-range.wxml

@@ -1,17 +1,15 @@
 <!--components/num-range/num-range.wxml-->
 
-
-
 <view class="content">
   <!-- 左边视图 -->
   <view class="left">
     <input value="0.00" placeholder="请输入数值"></input>
-    <text>CT</text>
+    <text class="unit">{{unit}}</text>
   </view>
   <text style="text-align: center;">~</text>
   <!-- 右边边视图 -->
   <view class="right">
     <input value="0.00" placeholder="请输入数值"></input>
-    <text>CT</text>
+    <text class="unit">{{unit}}</text>
   </view>
 </view>

GuangZuan/miniprogram/custom-tab-bar/index.ts

@@ -17,7 +17,7 @@ Component({
   data: {
     active: 0,
     color: '#7d7e80',
-    activeColor: '#55A154',
+    activeColor: '#D42A26',
     list: [
 			{
 				icon: 'wap-home',
@@ -46,7 +46,7 @@ Component({
    * 组件的方法列表
    */
   methods: {
-    onChange(e) {
+    onChange(e: any) {
 			wx.switchTab({
 				url: this.data.list[e.detail].url
       });

GuangZuan/miniprogram/mHome/pages/calculator/calculator.less

@@ -5,80 +5,75 @@
   flex-direction: row;
   width: 100%;
   align-items: flex-start;
-}
-
-.shape {
-  width: 16%;
-}
-
-.shape-item, .color-item, .neatness-item {
-  display: grid;
-  align-items: center;
-  align-content: center;
-  justify-content: center;
-  text-align: center;
-  border-bottom: 1px solid #ccc;
-  border-right: 1px solid #ccc;
-  height: 90px;
-
-  text {
-    margin-top: 5px;
-    font-size: 22rpx;
-    color: #333;
+  
+  .shape {
+    width: 16%;
   }
-}
-
-.color, .neatness {
-  width: 13%;
-  font-size: 14px;
-}
-
-.calculator {
-  display: flex;
-  flex-wrap: wrap;
-  flex-direction: row;
-  width: 58%;
-  height: 370px;
-
-  view {
-    width: 50%;
-    height: 100px;
+  .shape-item, .color-item, .neatness-item {
     display: grid;
+    align-items: center;
     align-content: center;
-    border-bottom: 1px solid #ddd;
-    justify-content: start;
-
+    justify-content: center;
+    text-align: center;
+    border-bottom: 1px solid #ccc;
+    border-right: 1px solid #ccc;
+    height: 80px;
+  
     text {
-      margin: 10px;
+      margin-top: 5px;
+      font-size: 22rpx;
       color: #333;
     }
   }
-}
-
-
 
+  .color, .neatness {
+    width: 13%;
+    font-size: 14px;
+  }
 
+  .right-content {
+    display: flex;
+    flex-wrap: wrap;
+    flex-direction: row;
+    width: 58%;
+    position: relative;
+  
+    view {
+      width: 50%;
+      height: 100px;
+      display: grid;
+      align-content: center;
+      border-bottom: 1px solid #ddd;
+      justify-content: start;
+  
+      text {
+        margin: 10px;
+        color: #333;
+      }
+  
+      text:nth-child(1) {
+        font-size: 13px;
+        height: 15px;
+      }
+      
+      text:nth-child(2) {
+        font-size: 16px;
+        color: #333;
+        height: 10px;
+      }
+      
+      text:nth-child(3) {
+        font-size: 12px;
+        color: #999;
+        height: 15px;
+      }
+    }
+  }
+}
 
 input {
   margin: 0px 0px 0px 10px;
   background-color: white;
   height: 40px;
   font-size: 14px;
-}
-
-.calculator view text:nth-child(1) {
-  font-size: 13px;
-  height: 15px;
-}
-
-.calculator view text:nth-child(2) {
-  font-size: 16px;
-  color: #333;
-  height: 10px;
-}
-
-.calculator view text:nth-child(3) {
-  font-size: 12px;
-  color: #999;
-  height: 15px;
 }

GuangZuan/miniprogram/mHome/pages/calculator/calculator.ts

@@ -48,6 +48,18 @@ Page({
               {id: 10, name: 'l2'}],
     /// 选中净度
     neatnes: '',
+    /// 重量
+    weight: 0.0,
+    /// 价格
+    price: 0.0,
+    /// 汇率
+    erate: 0.0,
+    /// 折扣
+    discount: 0.0,
+    /// 美元
+    doller: 0.0,
+    /// 人民币
+    rmb: 0.0
   },
 
   /**
@@ -61,7 +73,7 @@ Page({
    * 生命周期函数--监听页面初次渲染完成
    */
   onReady() {
-
+    console.log(this.data.windowHeight)
   },
 
   /**

GuangZuan/miniprogram/mHome/pages/calculator/calculator.wxml

@@ -23,30 +23,30 @@
     </view>
   </scroll-view>
 
-  <view class="calculator">
+  <view class="right-content">
     <view class="weight"> 
       <text>重量（ct）</text>
-      <input placeholder="请输入重量"></input>
+      <input placeholder="请输入重量" value="{{weight}}" type="digit"></input>
     </view>
     <view class="price"> 
       <text>国际报价</text>
-      <input placeholder="请输入价格"></input>
+      <input placeholder="请输入价格" value="{{price}}" type="digit"></input>
     </view>
     <view class="exchangerate"> 
       <text>汇率</text>
-      <input placeholder="请输入汇率"></input>
+      <input placeholder="请输入汇率" value="{{erate}}" type="digit"></input>
     </view>
     <view class="discount"> 
       <text>折扣（%）</text>
-      <input placeholder="请输入折扣"></input>
+      <input placeholder="请输入折扣" value="{{discount}}" type="digit"></input>
     </view>
     <view class="doller"> 
       <text>美元</text>
-      <input placeholder="请输入美元"></input>
+      <input placeholder="请输入美元" value="{{doller}}" type="digit"></input>
     </view>
     <view class="rmb"> 
       <text>人民币</text>
-      <input placeholder="请输入人民币"></input>
+      <input placeholder="请输入人民币" value="{{rmb}}" type="digit"></input>
     </view>
     <view class="dollerrate"> 
       <text>美元</text>

GuangZuan/miniprogram/mHome/pages/msg/msgdetail/msgdetail.less

@@ -1 +1,27 @@
-/* mHome/pages/msg/msgdetail/msgdetail.wxss */
+/* mHome/pages/msg/msgdetail/msgdetail.wxss */
+
+Page {
+  display: grid;
+
+  .title {
+    text-align: center;
+    font-size: 18px;
+    padding: 10px;
+    color: #333;
+  }
+
+  .date {
+    text-align: right;
+    padding: 0px 12px;
+    color: #999;
+    font-size: 14px;
+  }
+
+  .content {
+    padding: 10px 12px;
+    text-align: left;
+    color: #444;
+    font-size: 14px;
+  }
+}
+

GuangZuan/miniprogram/mHome/pages/msg/msgdetail/msgdetail.ts

@@ -5,14 +5,18 @@ Page({
    * 页面的初始数据
    */
   data: {
-
+    /// 新闻信息
+    msg: {}
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
-  onLoad() {
-
+  onLoad(options) {
+    /// 传参信息
+    this.setData({
+      msg: JSON.parse(options.id)
+    })
   },
 
   /**

GuangZuan/miniprogram/mHome/pages/msg/msgdetail/msgdetail.wxml

@@ -1 +1,8 @@
 <!--pages/msg/msgdetail/msgdetail.wxml-->
+
+<!-- title -->
+<text class="title">{{msg.title}}</text>
+<!-- date -->
+<text class="date">{{msg.date}}</text>
+<!-- content -->
+<text class="content">{{msg.content}}</text>

GuangZuan/miniprogram/mHome/pages/msg/msglist/msglist.ts

@@ -11,9 +11,11 @@ Page({
   },
 
   /// 进入公告消息详情页
-  goToMsgDetail() {
+  goToMsgDetail(r: any) {
+    console.log(r)
+    let jsonStr = JSON.stringify(this.data.msgs[r.currentTarget.id])
     wx.navigateTo({
-      url: '/mHome/pages/msg/msgdetail/msgdetail'
+      url: '/mHome/pages/msg/msgdetail/msgdetail?id='+jsonStr
     })
   },
 
@@ -21,7 +23,7 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad() {
-
+    
   },
 
   /**

GuangZuan/miniprogram/mHome/pages/msg/msglist/msglist.wxml

@@ -1,7 +1,7 @@
 <!--pages/msg/msglist/msglist.wxml-->
 
 <van-cell-group>
-  <van-cell custom-class="msg-item" wx:for="{{msgs}}" wx:key="id" wx:for-index="idx" wx:for-item="itm" bind:click="goToMsgDetail">
+  <van-cell custom-class="msg-item" wx:for="{{msgs}}" wx:key="id" wx:for-index="idx" wx:for-item="itm" id="{{idx}}" bind:click="goToMsgDetail">
     <view solt="title" class="view_top_content">
       <text class="msg_title">{{itm.title}}</text>
       <text class="msg_date">{{itm.date}}</text>

GuangZuan/miniprogram/mHome/pages/news/news.less

@@ -1 +1,26 @@
-/* mHome/pages/news/news.wxss */
+/* mHome/pages/news/news.wxss */
+
+Page {
+  display: grid;
+
+  .title {
+    text-align: center;
+    font-size: 18px;
+    padding: 10px;
+    color: #333;
+  }
+
+  .date {
+    text-align: right;
+    padding: 0px 12px;
+    color: #999;
+    font-size: 14px;
+  }
+
+  .content {
+    padding: 10px 12px;
+    text-align: left;
+    color: #444;
+    font-size: 14px;
+  }
+}

GuangZuan/miniprogram/mHome/pages/news/news.ts

@@ -5,14 +5,18 @@ Page({
    * 页面的初始数据
    */
   data: {
-
+    /// 新闻信息
+    news: {}
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
-  onLoad() {
-
+  onLoad(options) {
+    /// 传参信息
+    this.setData({
+      news: JSON.parse(options.id)
+    })
   },
 
   /**

GuangZuan/miniprogram/mHome/pages/news/news.wxml

@@ -1 +1,8 @@
 <!--mHome/pages/news/news.wxml-->
+
+<!-- title -->
+<text class="title">{{news.title}}</text>
+<!-- date -->
+<text class="date">{{news.date}}</text>
+<!-- content -->
+<text class="content">{{news.content}}</text>

GuangZuan/miniprogram/mMine/pages/myorders/myorders.less

@@ -2,6 +2,13 @@
 
 .title-view {
   background-color: #f0f0f0;
+
+  .title-view-text {
+    font-size: 12px;
+    color: #666;
+    text-align: center;
+    border-right: 1px solid #f0f0f0;
+  }
 }
 
 .title-view, .order-list-item-row {
@@ -14,15 +21,18 @@
 
 .order-list-item {
   display: grid;
+
+  text {
+    font-size: 14px;
+    color: #333;
+    text-align: center;
+    border-right: 1px solid #f0f0f0;
+  }
 }
 
 .order-list-item-btn {
   padding: 7.5px 0px;
   display: flex;
-  justify-content: end;
-  width: 190px;
-  position: relative;
-  right: -235px;
   height: 30px;
 
   button {
@@ -38,18 +48,20 @@
   .listing-detail {
     background-color: yellowgreen;
   }
-}
 
-.title-view text {
-  font-size: 12px;
-  color: #666;
-  text-align: center;
-  border-right: 1px solid #f0f0f0;
-}
+  .cancel {
+    background-color: chocolate;
+  }
+
+  .sale-detail {
+    background-color: sandybrown;
+  }
 
-.order-list-item text {
-  font-size: 14px;
-  color: #333;
-  text-align: center;
-  border-right: 1px solid #f0f0f0;
+  .sale-order {
+    background-color: darkgoldenrod;
+  }
+
+  .buy-order {
+    background-color: teal;
+  }
 }

GuangZuan/miniprogram/mMine/pages/myorders/myorders.ts

@@ -7,8 +7,9 @@ Page({
   data: {
     /// 列头
     tabs: [{id: 1, name: '我的出售'}, 
-           {id: 1, name: '我的求购'}, 
-           {id: 3, name: '我的摘牌'}],
+           {id: 2, name: '我的求购'}, 
+           {id: 3, name: '我的摘牌'}, 
+           {id: 4, name: '我的询价'}],
     /// 是否空数据
     isEmpty: false,
     /// 选中行数
@@ -21,7 +22,6 @@ Page({
     titles: ['状态', '挂牌方', '商品分类/编号', '委托量', '委托价', '成交数量'],
     /// 内容
     values: [['圆形', 'E-J', 'FL-VS1', '￥21002.00', '10.04', '0.51']],
-    
   },
 
   /**

GuangZuan/miniprogram/mMine/pages/myorders/myorders.wxml

@@ -10,7 +10,7 @@
 <scroll-view class="scroll-view" scroll-x enable-flex>
   <!-- 列头 -->
   <view class="title-view" style="width: {{totalWidth}}px;">
-    <text wx:for="{{titles}}" wx:for-index="idx" wx:for-item="itm" wx:key="idx" id="idx" style="width: {{widths[idx]}}px;">{{itm}}</text>
+    <text class="title-view-text" wx:for="{{titles}}" wx:for-index="idx" wx:for-item="itm" wx:key="idx" id="idx" style="width: {{widths[idx]}}px;">{{itm}}</text>
   </view>
 
   <!-- 数据内容 -->
@@ -24,8 +24,16 @@
       <view class="order-list-item-btn" wx:if="{{selectRow != -1 && selectRow == index}}">
         <!-- 商品详情 -->
         <button class="goods-detail" id="goods-detail" bindtap="onButtonPressed">商品详情</button>
+        <!-- 出售详情 -->
+        <button class="sale-detail" id="sale-detail" bindtap="onButtonPressed">出售详情</button>
         <!-- 挂牌详情 -->
         <button class="listing-detail" id="listing-detail" bindtap="onButtonPressed">挂牌详情</button>
+        <!-- 买委托单 -->
+        <button class="buy-order" id="buy-order" bindtap="onButtonPressed">买委托单</button>
+        <!-- 卖委托单 -->
+        <button class="sale-order" id="sale-order" bindtap="onButtonPressed">卖委托单</button>
+        <!-- 撤销 -->
+        <button class="cancel" id="cancel" bindtap="onButtonPressed">撤销</button>
       </view>
     </view>
   </view>

GuangZuan/miniprogram/mMine/pages/realauth/realauth.less

@@ -0,0 +1 @@
+/* mMine/pages/realauth/realauth.wxss */

GuangZuan/miniprogram/mMine/pages/spotlisting/spotlisting.ts → GuangZuan/miniprogram/mMine/pages/realauth/realauth.ts

@@ -1,4 +1,4 @@
-// pages/mine/spotlisting/spotlisting.ts
+// moduleMine/pages/realauth/realauth.ts
 Page({
 
   /**

GuangZuan/miniprogram/mMine/pages/realauth/realauth.wxml

@@ -0,0 +1 @@
+<!--moduleMine/pages/realauth/realauth.wxml-->

GuangZuan/miniprogram/mMine/pages/realauthentication/realauthentication.less

@@ -1 +0,0 @@
-/* mMine/pages/realauthentication/realauthentication.wxss */

GuangZuan/miniprogram/mMine/pages/realauthentication/realauthentication.ts

@@ -1,66 +0,0 @@
-// moduleMine/pages/realauthentication/realauthentication.ts
-Page({
-
-  /**
-   * 页面的初始数据
-   */
-  data: {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload() {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh() {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom() {
-
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage() {
-
-  }
-})

GuangZuan/miniprogram/mMine/pages/realauthentication/realauthentication.wxml

@@ -1 +0,0 @@
-<!--moduleMine/pages/realauthentication/realauthentication.wxml-->

GuangZuan/miniprogram/mMine/pages/spotlisting/spotlisting.json

@@ -1,4 +0,0 @@
-{
-  "usingComponents": {},
-  "navigationBarTitleText": "现货挂牌"
-}

GuangZuan/miniprogram/mMine/pages/spotlisting/spotlisting.less

@@ -1 +0,0 @@
-/* mMine/pages/spotlisting/spotlisting.wxss */

GuangZuan/miniprogram/mMine/pages/spotlisting/spotlisting.wxml

@@ -1 +0,0 @@
-<!--pages/mine/spotlisting/spotlisting.wxml-->

GuangZuan/miniprogram/mTrade/pages/listing/listing.wxml

@@ -13,7 +13,7 @@
   <view class="cell-view tradeaccount"> 
     <text>交易账户</text>
     <view class="tradeaccount-content">
-      <button style="width: 95%;">-----------</button>
+      <button style="width: 100%;">-----------</button>
     </view>
   </view>
 
@@ -28,7 +28,7 @@
   <!-- 重量 -->
   <view class="cell-view weight"> 
     <text>重量</text>
-    <num-range></num-range>
+    <num-range unit="RB"></num-range>
   </view>
 
    <!-- 价格 -->

GuangZuan/miniprogram/pages/circle/circle.ts

@@ -14,23 +14,23 @@ Page({
     /// tabs
     tabs: ['收藏', '首页', '快讯', '精华', '评论', '公告'],
     /// 新闻资讯内容
-    news: [{id: 1, title: '培育钻品牌有了新玩法', content: '培育钻品牌有了新玩法上游技术升级和下游消费者教育走向成熟，两到三年的快速增长后走向成熟。输入框。该组件是原生组件，使用时请注意相关限制', img: 'https://img.yzcdn.cn/vant/cat.jpeg'}, 
-           {id: 2, title: '培育钻品牌有了新玩法', content: '培育钻品牌有了新玩法上游技术升级和下游消费者教育走向成熟，两到三年的快速增长后走向成熟。输入框。该组件是原生组件，使用时请注意相关限制', img: 'https://img.yzcdn.cn/vant/cat.jpeg'}, 
-           {id: 3, title: '培育钻品牌有了新玩法', content: '培育钻品牌有了新玩法上游技术升级和下游消费者教育走向成熟，两到三年的快速增长后走向成熟。输入框。该组件是原生组件，使用时请注意相关限制', img: 'https://img.yzcdn.cn/vant/cat.jpeg'}, 
-           {id: 4, title: '培育钻品牌有了新玩法', content: '培育钻品牌有了新玩法上游技术升级和下游消费者教育走向成熟，两到三年的快速增长后走向成熟。输入框。该组件是原生组件，使用时请注意相关限制', img: 'https://img.yzcdn.cn/vant/cat.jpeg'}, 
-           {id: 5, title: '培育钻品牌有了新玩法', content: '培育钻品牌有了新玩法上游技术升级和下游消费者教育走向成熟，两到三年的快速增长后走向成熟。输入框。该组件是原生组件，使用时请注意相关限制', img: 'https://img.yzcdn.cn/vant/cat.jpeg'}, 
-           {id: 6, title: '培育钻品牌有了新玩法', content: '培育钻品牌有了新玩法上游技术升级和下游消费者教育走向成熟，两到三年的快速增长后走向成熟。输入框。该组件是原生组件，使用时请注意相关限制', img: 'https://img.yzcdn.cn/vant/cat.jpeg'}, 
-           {id: 7, title: '培育钻品牌有了新玩法', content: '培育钻品牌有了新玩法上游技术升级和下游消费者教育走向成熟，两到三年的快速增长后走向成熟。输入框。该组件是原生组件，使用时请注意相关限制', img: 'https://img.yzcdn.cn/vant/cat.jpeg'}, 
-           {id: 8, title: '培育钻品牌有了新玩法', content: '培育钻品牌有了新玩法上游技术升级和下游消费者教育走向成熟，两到三年的快速增长后走向成熟。输入框。该组件是原生组件，使用时请注意相关限制', img: 'https://img.yzcdn.cn/vant/cat.jpeg'}, 
-           {id: 9, title: '培育钻品牌有了新玩法', content: '培育钻品牌有了新玩法上游技术升级和下游消费者教育走向成熟，两到三年的快速增长后走向成熟。输入框。该组件是原生组件，使用时请注意相关限制', img: 'https://img.yzcdn.cn/vant/cat.jpeg'}]
+    news: [{id: 1, title: '培育钻品牌ddd有了新玩法', content: '培育钻品牌有了新玩法上游技术升级和下游消费者教育走向成熟，两到三年的快速增长后走向成熟。输入框。该组件是原生组件，使用时请注意相关限制', img: 'https://img.yzcdn.cn/vant/cat.jpeg'}, 
+           {id: 2, title: '培育钻品牌有了新玩法', content: '培育钻品牌有了新玩法上游技术升级和下游消费者教育走向成熟，两到三年的快速增长后走向成熟。输入框。该组件是原生组件，使用时请注意相关限制', date: '2021/12/12', img: 'https://img.yzcdn.cn/vant/cat.jpeg'}, 
+           {id: 3, title: '培育钻品牌有了新玩法', content: '培育钻品牌有了新玩法上游技术升级和下游消费者教育走向成熟，两到三年的快速增长后走向成熟。输入框。该组件是原生组件，使用时请注意相关限制', date: '2021/12/12', img: 'https://img.yzcdn.cn/vant/cat.jpeg'}, 
+           {id: 4, title: '培育钻品fff牌有了新玩法', content: '培育钻品牌有了新玩法上游技术升级和下游消费者教育走向成熟，两到三年的快速增长后走向成熟。输入框。该组件是原生组件，使用时请注意相关限制', date: '2021/12/12', img: 'https://img.yzcdn.cn/vant/cat.jpeg'}, 
+           {id: 5, title: '培育钻品牌有了新玩法', content: '培育钻品牌有了新玩法上游技术升级和下游消费者教育走向成熟，两到三年的快速增长后走向成熟。输入框。该组件是原生组件，使用时请注意相关限制', date: '2021/12/12', img: 'https://img.yzcdn.cn/vant/cat.jpeg'}, 
+           {id: 6, title: '培育钻品牌有了新玩法', content: '培育钻品牌有了新玩法上游技术升级和下游消费者教育走向成熟，两到三年的快速增长后走向成熟。输入框。该组件是原生组件，使用时请注意相关限制', date: '2021/12/12', img: 'https://img.yzcdn.cn/vant/cat.jpeg'}, 
+           {id: 7, title: '培育钻品牌有了新玩法', content: '培育钻品牌有了新玩法上游技术升级和下游消费者教育走向成熟，两到三年的快速增长后走向成熟。输入框。该组件是原生组件，使用时请注意相关限制', date: '2021/12/12', img: 'https://img.yzcdn.cn/vant/cat.jpeg'}, 
+           {id: 8, title: '培育钻品牌有了新玩法', content: '培育钻品牌有了新玩法上游技术升级和下游消费者教育走向成熟，两到三年的快速增长后走向成熟。输入框。该组件是原生组件，使用时请注意相关限制', date: '2021/12/12', img: 'https://img.yzcdn.cn/vant/cat.jpeg'}, 
+           {id: 9, title: '培育钻品牌有了新玩法', content: '培育钻品牌有了新玩法上游技术升级和下游消费者教育走向成熟，两到三年的快速增长后走向成熟。输入框。该组件是原生组件，使用时请注意相关限制', date: '2021/12/12', img: 'https://img.yzcdn.cn/vant/cat.jpeg'}]
   },
 
   /**
    * 跳转新闻详情页面方法
    */
-  goToNews() {
+  goToNews(e: any) {
     wx.navigateTo({
-      url: '/mHome/pages/news/news'
+      url: '/mHome/pages/news/news?id='+JSON.stringify(this.data.news[e.currentTarget.id])
     })
   },
 

GuangZuan/miniprogram/pages/circle/circle.wxml

@@ -2,7 +2,7 @@
 
 <view class="top-view" style="position: sticky; top: 0; z-index: 999;">
   <!-- 搜索框 -->
-  <van-search value="{{ value }}" shape="round" placeholder="请输入搜索关键词" background="#4fc08d" use-action-slot bind:change="onChange" bind:search="onSearch">
+  <van-search value="{{ value }}" shape="round" placeholder="请输入搜索关键词" background="red" use-action-slot bind:change="onChange" bind:search="onSearch">
     <view class="search" slot="action" bind:tap="onClick">搜索</view>
   </van-search>
 
@@ -14,5 +14,5 @@
 
 <!-- 新闻视图 -->
 <view class="news-lists">
-  <news-item class="new-lists-item" wx:for="{{news}}" wx:key="id" wx:for-item="itm" wx:for-index="idx" bindtap="goToNews"></news-item>
+  <news-item class="new-lists-item" wx:for="{{news}}" wx:key="id" wx:for-item="itm" wx:for-index="idx" bindtap="goToNews" id="{{idx}}" title="{{itm.title}}" content="{{itm.content}}" imgUrl="{{itm.img}}"></news-item>
 </view>

GuangZuan/miniprogram/pages/home/home.less

@@ -18,8 +18,9 @@
   justify-content: space-between;
   margin: 10px;
   background-color: #f0f0f0;
-  padding: 10px;
-  border-radius: 10px;
+  padding: 15px;
+  border-radius: 15px;
+  box-shadow: 5px 5px 5px #aaa;
 
   .statistics-item {
     display: grid;
@@ -30,7 +31,7 @@
   text {
     margin-top: 5px;
     font-size: 26rpx;
-    color: #666;
+    color: #fff;
   }
 }
 
@@ -92,7 +93,7 @@
   align-content: center;
 
   van-search {
-    width: 95%;
+    width: 100%;
   }
 }
 
@@ -103,32 +104,46 @@
   align-content: center;
 
   .title {
-    font-size: 18px;
-    color: blue;
+    font-size: 20px;
+    color: rebeccapurple;
     margin: 5px 0px;
   }
 }
 
 .goldprice, .exchangerate, .calculator {
-  width: 25px;
-  background-color: #f0f0f0;
+  width: 23px;
   text-align: center;
-  vertical-align: middle;
   display: flex;
   justify-content: center;
   align-items: center;
   align-content: center;
-  font-size: 14px;
-  padding: 5px;
-  color: #444;
+  font-size: 12px;
+  margin: 3px;
+  color: #fff;
+  border-radius: 5px;
+  position: absolute; 
+  box-shadow: 3px 3px 3px #aaa;
 }
 
 .goldprice {
   height: 60px;
+  top: 42%; 
+  left: 5px;
+  background-color: navy;
+}
+
+.exchangerate {
+  height: 90px;
+  top: 42%; 
+  right: 5px; 
+  background-color: lightcoral;
 }
 
-.exchangerate, .calculator {
-  height: 100px;
+.calculator {
+  height: 90px;
+  bottom: 120px; 
+  right: 5px;
+  background-color: hotpink;
 }
 
 

GuangZuan/miniprogram/pages/home/home.ts

@@ -24,23 +24,23 @@ Page({
                  {id: 2, title: '钻石总数', value: 20200}, 
                  {id: 3, title: '已注册会员', value: 200}],
     /// 新闻资讯内容
-    news: [{id: 1, title: '培育钻品牌有了新玩法', content: '培育钻品牌有了新玩法上游技术升级和下游消费者教育走向成熟，两到三年的快速增长后走向成熟。输入框。该组件是原生组件，使用时请注意相关限制', img: 'https://img.yzcdn.cn/vant/cat.jpeg'}, 
-           {id: 2, title: '培育钻品牌有了新玩法', content: '培育钻品牌有了新玩法上游技术升级和下游消费者教育走向成熟，两到三年的快速增长后走向成熟。输入框。该组件是原生组件，使用时请注意相关限制', img: 'https://img.yzcdn.cn/vant/cat.jpeg'}, 
-           {id: 3, title: '培育钻品牌有了新玩法', content: '培育钻品牌有了新玩法上游技术升级和下游消费者教育走向成熟，两到三年的快速增长后走向成熟。输入框。该组件是原生组件，使用时请注意相关限制', img: 'https://img.yzcdn.cn/vant/cat.jpeg'}, 
-           {id: 4, title: '培育钻品牌有了新玩法', content: '培育钻品牌有了新玩法上游技术升级和下游消费者教育走向成熟，两到三年的快速增长后走向成熟。输入框。该组件是原生组件，使用时请注意相关限制', img: 'https://img.yzcdn.cn/vant/cat.jpeg'}, 
-           {id: 5, title: '培育钻品牌有了新玩法', content: '培育钻品牌有了新玩法上游技术升级和下游消费者教育走向成熟，两到三年的快速增长后走向成熟。输入框。该组件是原生组件，使用时请注意相关限制', img: 'https://img.yzcdn.cn/vant/cat.jpeg'}, 
-           {id: 6, title: '培育钻品牌有了新玩法', content: '培育钻品牌有了新玩法上游技术升级和下游消费者教育走向成熟，两到三年的快速增长后走向成熟。输入框。该组件是原生组件，使用时请注意相关限制', img: 'https://img.yzcdn.cn/vant/cat.jpeg'}, 
-           {id: 7, title: '培育钻品牌有了新玩法', content: '培育钻品牌有了新玩法上游技术升级和下游消费者教育走向成熟，两到三年的快速增长后走向成熟。输入框。该组件是原生组件，使用时请注意相关限制', img: 'https://img.yzcdn.cn/vant/cat.jpeg'}, 
-           {id: 8, title: '培育钻品牌有了新玩法', content: '培育钻品牌有了新玩法上游技术升级和下游消费者教育走向成熟，两到三年的快速增长后走向成熟。输入框。该组件是原生组件，使用时请注意相关限制', img: 'https://img.yzcdn.cn/vant/cat.jpeg'}, 
-           {id: 9, title: '培育钻品牌有了新玩法', content: '培育钻品牌有了新玩法上游技术升级和下游消费者教育走向成熟，两到三年的快速增长后走向成熟。输入框。该组件是原生组件，使用时请注意相关限制', img: 'https://img.yzcdn.cn/vant/cat.jpeg'}]
+    news: [{id: 1, title: '培育vvv钻品牌fff有了新玩法', content: '培育钻品牌有了新玩法上游技术升级和下游消费者教育走向成熟，两到三年都发的说法的说法收到的快速增长后走向成熟。输入框。该组件是原生组件，使用时请注意相关限制', date: '2021/12/12', img: 'https://img.yzcdn.cn/vant/cat.jpeg'}, 
+           {id: 2, title: '培育钻品ffddsdsfdsf牌有了新玩法', content: '培育钻品牌有了新玩法上游技术升级和下游消费者教育走向成熟，两到三年的快速增长后走向成熟。输入框。该组件是原生组件，使用时请注意相关限制', date: '2021/12/12', img: 'https://img.yzcdn.cn/vant/cat.jpeg'}, 
+           {id: 3, title: '培育', content: '培育钻品牌有了新玩法上游技术升级和下游消费者教育走向成熟，两到三年的快速增长后走向成熟。输入框。该组件是原生组件，使用时请注意相关限制', date: '2021/12/12', img: 'https://img.yzcdn.cn/vant/cat.jpeg'}, 
+           {id: 4, title: '培育钻品牌有了新玩法', content: '培育钻品牌有了新玩法上游技术升级和下游消费者教育走向成熟，两到三年的快速增长后走向成熟。输入框。该组件是原生组件，使用时请注意相关限制', date: '2021/12/12', img: 'https://img.yzcdn.cn/vant/cat.jpeg'}, 
+           {id: 5, title: '培育钻品牌有了新玩法', content: '培育钻品牌有了新玩法上游技术升级和下游消费者教育走向成熟，两到三年的快速增长后走向成熟。输入框。该组件是原生组件，使用时请注意相关限制', date: '2021/12/12', img: 'https://img.yzcdn.cn/vant/cat.jpeg'}, 
+           {id: 6, title: '培育钻品牌有了新玩法', content: '培育钻品牌有了新玩法上游技术升级和下游消费者教reewrrfewfewf热供热管热人发热管缝纫工育走向成熟，两到三年的快速增长后走向成熟。输入框。该组件是原生组件，使用时请注意相关限制', date: '2021/12/12', img: 'https://img.yzcdn.cn/vant/cat.jpeg'}, 
+           {id: 7, title: '培育钻品牌有了新玩法', content: '培育钻品牌有了新玩法上游技术升级和下游消费者教育走向成熟，两到三年的快速增长后走向成熟。输入框。该组件是原生组件，使用时请注意相关限制', date: '2021/12/12', img: 'https://img.yzcdn.cn/vant/cat.jpeg'}, 
+           {id: 8, title: '培育钻品牌有了新玩法', content: '培育钻品牌有了新玩法上游技术升级和下游消费者教育走向成熟，两到三年的快速增长后走向成熟。输入框。该组件是原生组件，使用时请注意相关限制', date: '2021/12/12', img: 'https://img.yzcdn.cn/vant/cat.jpeg'}, 
+           {id: 9, title: '培育钻品牌有了新玩法', content: '培育钻品牌有了新玩法上游技术升级和下游消费者教育走向成熟，两到三年的快速增长后走向成熟。输入框。该组件是原生组件，使用时请注意相关限制', date: '2021/12/12', img: 'https://img.yzcdn.cn/vant/cat.jpeg'}]
   },
 
   /**
    * 跳转新闻详情页面方法
    */
-  goToNews() {
+  goToNews(e: any) {
     wx.navigateTo({
-      url: '/mHome/pages/news/news'
+      url: '/mHome/pages/news/news?id='+JSON.stringify(this.data.news[e.currentTarget.id])
     })
   },
 

GuangZuan/miniprogram/pages/home/home.wxml

@@ -1,4 +1,5 @@
 <!--pages/home/home.wxml-->
+
 <scroll-view style="position: absolute; height: {{windowHeight-safeBottom-50}}px;" scroll-y>
   <!-- banner轮播图 -->
   <swiper class="banner" indicator-active-color="white" indicator-dots autoplay interval="5000" circular>
@@ -13,7 +14,7 @@
   <van-notice-bar left-icon="volume-o" mode="link" bind:click="goToMsg" color="#333" background="#f3f3f3" text="在代码阅读过程中人们说脏话的频率是衡量代码质量的唯一标准。" scrollable></van-notice-bar>
 
   <!-- 统计 -->
-  <view class="statistics">
+  <view class="statistics" style="background-color: firebrick;">
     <view class="statistics-item" wx:for="{{statistics}}" wx:key="id" wx:for-index="idx" wx:for-item="itm">
       <text>{{itm.title}}</text>
       <text>{{itm.value}}</text>
@@ -25,7 +26,7 @@
     <view class="menu-item" wx:for="{{menus}}" wx:key="id" wx:for-index="idx" wx:for-item="itm">
       <!-- 钻石菜单项 -->
       <navigator class="menus-item1" url="{{itm[0].path}}">
-        <text class="title">{{itm[0].title}}</text>
+        <text class="title" user-select>{{itm[0].title}}</text>
         <image src="https://img.yzcdn.cn/vant/cat.jpeg" mode="aspectFill"></image>
       </navigator>
       <!-- 功能菜单项 -->
@@ -43,17 +44,17 @@
 
   <!-- 新闻视图 -->
   <view class="news-lists">
-    <text class="title">资讯</text>
-    <news-item class="new-lists-item" wx:for="{{news}}" wx:key="id" wx:for-item="itm" wx:for-index="idx" bindtap="goToNews"></news-item>
+    <text class="title" user-select>资讯</text>
+    <news-item class="new-lists-item" wx:for="{{news}}" wx:key="id" wx:for-item="itm" wx:for-index="idx" id="{{idx}}" bindtap="goToNews" title="{{itm.title}}" content="{{itm.content}}" imgUrl="{{itm.img}}"></news-item>
   </view>
 </scroll-view>
 
 <!-- 金价  -->
-<navigator class="goldprice" style="position: absolute; top: 42%;" url="/mHome/pages/goldprice/goldprice">金价</navigator>
+<navigator class="goldprice" url="/mHome/pages/goldprice/goldprice">金价</navigator>
 <!-- 今日汇率  -->
-<navigator class="exchangerate" style="position: absolute; top: 42%; right: 5px;" url="/mHome/pages/exchangeRate/exchangeRate">今日汇率</navigator>
+<navigator class="exchangerate" url="/mHome/pages/exchangeRate/exchangeRate">今日汇率</navigator>
 <!-- 计算器  -->
-<navigator class="calculator" style="position: absolute; bottom: 100px; right: 5px;" url="/mHome/pages/calculator/calculator">计算器</navigator>
+<navigator class="calculator" url="/mHome/pages/calculator/calculator">计算器</navigator>
 
 
 

GuangZuan/miniprogram/pages/login/login.json

@@ -2,7 +2,9 @@
   "usingComponents": {
     "van-image": "@vant/weapp/image/index",
     "van-cell": "@vant/weapp/cell/index",
-    "van-cell-group": "@vant/weapp/cell-group/index"
+    "van-cell-group": "@vant/weapp/cell-group/index",  
+    "van-divider": "@vant/weapp/divider/index"
+
   },
   "navigationBarTitleText": "登录",
   "enablePullDownRefresh": false

GuangZuan/miniprogram/pages/login/login.less

@@ -13,7 +13,7 @@ Page {
   }
 
   van-cell-group {
-    width: 98%;
+    width: 100%;
   }
 
   .btn-view {
@@ -23,24 +23,13 @@ Page {
     align-items: center;
     margin: 40rpx;
     width: 90%;
+    padding-top: 5px;
 
     view {
       font-size: 24rpx;
       color: #444;
     }
   }
-
-  .login-view {
-    display: flex;
-    justify-content: center;
-    width: 95%;
-   
-    .login {
-     width: 100%;
-     background-color: #7232dd;
-     color: white;
-    }
-   }
    
    text {
     font-size: 20rpx;

GuangZuan/miniprogram/pages/login/login.ts

@@ -1,4 +1,5 @@
 // pages/login/login.ts
+
 Page({
 
   /**
@@ -21,9 +22,28 @@ Page({
    * 用户登录请求方法
    */
   onLogin() {
-     wx.reLaunch({
-       url: '/pages/home/home'
-     })
+    wx.getUserProfile({
+      desc: '登录获取',
+      /// 获取成功
+      success: (res) => {
+        try {
+          /// 存储微信头像和昵称
+          wx.setStorageSync('avatarUrl', res.userInfo.avatarUrl);
+          wx.setStorageSync('nickName', res.userInfo.nickName);
+        } catch (e) {}
+        /// 跳转到首页
+        wx.reLaunch({
+          url: '/pages/home/home'
+        })
+      },
+      /// 获取失败
+      fail: (er) => {
+        wx.showToast({
+          icon: 'error',
+          title: '获取微信信息失败，原因：'+er.errMsg
+        })
+      }
+    })   
   },
 
   /**

GuangZuan/miniprogram/pages/login/login.wxml

@@ -18,12 +18,11 @@
 </view>
 
 <!--  登录按钮  -->
-<view class="login-view"> 
-  <button class="login" bindtap="onLogin">登录</button>
-</view>
+<van-button loading="{{isLoding}}" block style="width: 90%; padding-top: 5px;" type="danger" loading-text="登录中..." bind:click="onLogin">登录</van-button>
 
 <!--  版权信息  -->
-<text style="position: absolute; bottom: {{safeBottom+20}}px;">Copyright 2022 guangzuan.ALL right reserved.版本号V{{version}}</text>
+<van-divider contentPosition="center" textColor="#1989fa" style="position: absolute; bottom: {{safeBottom+20}}px;" customStyle="color: #1989fa; border-color: #1989fa; font-size: 10px;">Copyright 2022 guangzuan.ALL right reserved.版本号V{{version}}
+</van-divider>
 
 <!-- toast -->
 <van-toast id="van-toast" />

GuangZuan/miniprogram/pages/mine/mine.less

@@ -6,23 +6,21 @@
   display: flex;
   align-items: center;
   align-content: center;
-  margin: 10px 10px 10px 10px;
-  background-color: violet;
+  margin: 15px;
+  background-color: red;
   border-radius: 10px;
+  box-shadow: 10px 10px 10px #ddd;
 
   van-image {
-    margin-left: 20px;
+    margin-left: 10px;
   }
   
-  .setting {
-    margin-right: 20px;
+  van-icon {
+    margin-right: 10px;
   }
 }
 
 .cell-title {
   color: #333;
   font-size: 14px;
-}
-
-
-
+}

GuangZuan/miniprogram/pages/mine/mine.ts

@@ -9,16 +9,20 @@ Page({
     // 功能菜单项
     menulists: [{id: 1, title: '资金资产', img: 'cart-circle', path: "/mMine/pages/assets/assets"}, 
                 {id: 2, title: "交易服务", img: 'point-gift',  path: "/mMine/pages/tradeserver/tradeserver"}, 
-                {id: 3, title: '现货挂牌', img: 'underway',    path: "/mMine/pages/spotlisting/spotlisting"}, 
+                {id: 3, title: '现货挂牌', img: 'underway',    path: "/mTrade/pages/listing/listing"}, 
                 {id: 4, title: '仓储服务', img: 'hot',         path: "/mMine/pages/storageserver/storageserver"}],
 
     // 列表菜单项
-    tablelists: [{id: 1, title: '实名认证',    path: "/mMine/pages/realauthentication/realauthentication"}, 
+    tablelists: [{id: 1, title: '实名认证',    path: "/mMine/pages/realauth/realauth"}, 
                  {id: 2, title: '签约解约管理', path: "/mMine/pages/bank/bank"}, 
                  {id: 3, title: '我的库存',    path: "/mMine/pages/myinventorys/myinventorys"}, 
                  {id: 4, title: '单据查询',    path: "/mMine/pages/ordersearch/ordersearch"}, 
                  {id: 5, title: '我的订单',    path: "/mMine/pages/myorders/myorders"}, 
-                 {id: 6, title: '我的报表',    path: "/mMine/pages/myreports/myreports"}] 
+                 {id: 6, title: '我的报表',    path: "/mMine/pages/myreports/myreports"}],
+    /// 微信头像 
+    avatarUrl: "",
+    /// 微信昵称
+    nickName: ""
   },
 
   /**
@@ -34,14 +38,20 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad() {
-
+    /// 获取微信头像
+    let url = wx.getStorageSync('avatarUrl')
+    if (url) {
+      this.setData({
+        avatarUrl: url
+      })
+    }
   },
 
   /**
    * 生命周期函数--监听页面初次渲染完成
    */
   onReady() {
-
+    
   },
 
   /**

GuangZuan/miniprogram/pages/mine/mine.wxml

@@ -3,8 +3,8 @@
 
 <!-- 我的顶部视图 -->
 <view class="minetop">
- <van-image src="https://img.yzcdn.cn/vant/cat.jpeg" round width="50" height="50"></van-image>
- <van-button custom-class="setting" icon="setting-o" bind:click="goToSettings"></van-button>
+ <van-image src="{{avatarUrl}}" round width="50" height="50"></van-image>
+ <van-icon name="setting-o" color="#fff" size="25px" bind:click="goToSettings"/>
 </view>
 
 <!-- 功能菜单项 -->

GuangZuan/miniprogram/pages/trade/trade.less

@@ -30,22 +30,20 @@
 .list-item-row {
   height: 45px;
   border-bottom: 1px solid #f0f0f0;
-}
 
-.list-item-row text {
-  font-size: 14px;
-  color: #333;
-  text-align: center;
-  border-right: 1px solid #f0f0f0;
+  text {
+    font-size: 14px;
+    color: #333;
+    text-align: center;
+  }
 }
 
 .list-item-btn {
   padding: 10px 0px;
   display: flex;
-  width: 280px;
-  position: relative;
-  right: -145px;
+  justify-content: space-around;
   height: 30px;
+  width: 430px;
 
   button {
     font-size: 12px;
@@ -53,12 +51,20 @@
     width: 80px;
   }
 
-  .buyinto {
+  .goods-info {
     background-color: rebeccapurple;
   }
    
-  .detail {
-    background-color: yellowgreen;
+  .listing-detail {
+    background-color: goldenrod;
+  }
+
+  .delisting {
+    background-color: seagreen;
+  }
+
+  .buy-ask {
+    background-color: chocolate;
   }
 
   .favitore {

GuangZuan/miniprogram/pages/trade/trade.ts

@@ -6,23 +6,24 @@ Page({
    */
   data: {
     /// tabs
-    tabs: [{id: 1, name: '成批裸钻'}, 
-           {id: 2, name: '单颗裸钻'}, 
-           {id: 3, name: '成批毛坯'}, 
-           {id: 4, name: '首饰'}, 
-           {id: 5, name: '彩钻'}],
+    tabs: [{id: 1, name: '出售大厅'}, 
+           {id: 2, name: '求购大厅'}],
     /// tab索引
     active: 0,
     /// 选中行数
     selectRow: -1,
     /// 列头
-    titles: ['形状', '颜色', '净度', '总价', '总重量', '单颗均重', '单价'],
+    titles: ['商品编号', '卖方', '商品分类', '总重量', '克拉单价', '成交重量', '委托状态'],
     /// 列表总宽度
     totalWidth: 0,
     /// 列表宽度
-    widths: [60, 60, 80, 110, 80, 80, 80],
+    widths: [110, 100, 80, 110, 80, 80, 80],
     /// 内容
-    values: [['圆形', 'E-J', 'FL-VS1', '￥21002.00', '10.04', '0.51', '￥202.00']]
+    values: [['CPLZ00000001', 'yyyy企业', '单颗裸钻', '10.23', '￥ 200.00', '1.23', '委托成功'],           
+             ['CPLZ00000001', 'yyyy企业', '单颗裸钻', '10.23', '￥ 200.00', '1.23', '委托成功'], 
+             ['CPLZ00000001', 'yyyy企业', '单颗裸钻', '10.23', '￥ 200.00', '1.23', '委托成功'], 
+             ['CPLZ00000001', 'yyyy企业', '单颗裸钻', '10.23', '￥ 200.00', '1.23', '委托成功'],
+             ['CPLZ00000001', 'yyyy企业', '单颗裸钻', '10.23', '￥ 200.00', '1.23', '委托成功']]
   },
 
   /**
@@ -40,12 +41,7 @@ Page({
   onButtonPressed(e: any){
     console.log(e)
     switch (e.currentTarget.id) {
-      case "buyinto":    /// 买入
-        wx.navigateTo({
-          url: '/mTrade/pages/listing/listing'
-        })
-        break;
-      case "detail":  /// 商品详情
+      case "goods-info":  /// 商品详情
         wx.navigateTo({
           url: '/mHome/pages/goodsdetail/goodsdetail'
         })
@@ -67,16 +63,7 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad() {
-    /// 计算总高度
-    let num = 0.0
-    this.data.widths.forEach(function(v) {
-      num += v
-    })
-
-    this.setData({
-      /// 设置总高度
-      totalWidth: num
-    })
+    
   },
 
   /**
@@ -91,6 +78,17 @@ Page({
    */
   onShow() {
     this.getTabBar().init()
+
+    /// 计算总高度
+    let num = 0.0
+    this.data.widths.forEach(function(v) {
+      num += v
+    })
+
+    this.setData({
+      /// 设置总高度
+      totalWidth: num
+    })
   },
 
   /**

GuangZuan/miniprogram/pages/trade/trade.wxml

@@ -7,27 +7,30 @@
   </van-tabs>  
 </view>
 
-<scroll-view class="scroll-view" scroll-x  enable-flex>
-
+<scroll-view class="scroll-view" scroll-x scroll-y enable-flex>
   <!-- 列头 -->
   <view class="title-view" style="width: {{totalWidth}}px;">
-    <text wx:for="{{titles}}" wx:for-index="idx" wx:for-item="itm" wx:key="idx" id="idx" style="width: {{widths[idx]}}px;">{{itm}}</text>
+    <text wx:for="{{titles}}" user-select wx:for-index="idx" wx:for-item="itm" wx:key="idx" id="idx" style="width: {{widths[idx]}}px;">{{itm}}</text>
   </view>
   <!-- 数据内容 -->
   <view class="list" style="width: {{totalWidth}}px;">
     <view class="list-item" wx:for="{{values}}" wx:for-item="lists" wx:key="index" id="{{index}}" bindtap="onListItemClick">
       <!-- 数据体 -->
       <view class="list-item-row" >
-        <text wx:for="{{lists}}" wx:for-index="idx" wx:for-item="itm" wx:key="idx" style="width: {{widths[idx]}}px;">{{itm}}</text>
+        <text wx:for="{{lists}}" user-select wx:for-index="idx" wx:for-item="itm" wx:key="idx" style="width: {{widths[idx]}}px;">{{itm}}</text>
       </view>
       <!-- 按钮 -->
       <view class="list-item-btn" wx:if="{{selectRow != -1 && selectRow == index}}">
-        <!-- 买入 -->
-        <button class="buyinto" id="buyinto" bindtap="onButtonPressed">买入</button>
+        <!-- 商品信息 -->
+        <button class="goods-info" id="goods-info" bindtap="onButtonPressed">商品信息</button>
+        <!-- 挂牌详情 -->
+        <button class="listing-detail" id="listing-detail" bindtap="onButtonPressed">挂牌详情</button>
+        <!-- 摘牌 -->
+        <button class="delisting" id="delisting" bindtap="onButtonPressed">摘牌</button>
+        <!-- 购买询价 -->
+        <button class="buy-ask" id="buy-ask" bindtap="onButtonPressed">购买询价</button>
         <!-- 收藏 -->
         <button class="favitore" id="favitore" bindtap="onButtonPressed">收藏</button>
-        <!-- 详情 -->
-        <button class="detail" id="detail" bindtap="onButtonPressed">详情</button>
       </view>
     </view>
   </view>