代码更新

GuangZuan/miniprogram/app.json

@@ -1,33 +1,33 @@
 {
   "pages": [
-    "pages/login/login",
-    "pages/home/home",
-    "pages/register/register",
-    "pages/circle/circle",
-    "pages/trade/trade",
-    "pages/mine/mine",
-    "pages/forgetpwd/forgetpwd"
+    "pages/login/index",
+    "pages/home/index",
+    "pages/register/index",
+    "pages/circle/index",
+    "pages/trade/index",
+    "pages/mine/index",
+    "pages/forgetpwd/index"
   ],
   "preloadRule": {
-    "pages/mine/mine": {
+    "pages/mine/index": {
       "network": "all",
       "packages": [
         "mMine"
       ]
     },
-    "pages/trade/trade": {
+    "pages/trade/index": {
       "network": "all",
       "packages": [
         "mTrade"
       ]
     },
-    "pages/home/home": {
+    "pages/home/index": {
       "network": "all",
       "packages": [
         "mHome"
       ]
     },
-    "pages/circle/circle": {
+    "pages/circle/index": {
       "network": "all",
       "packages": [
         "mCircle"
@@ -39,60 +39,60 @@
       "root": "mHome",
       "name": "mHome",
       "pages": [
-        "pages/bond/list/list",
-        "pages/bond/detail/detail",
-        "pages/inspection/list/list",
-        "pages/inspection/detail/detail",
-        "pages/calculator/calculator",
-        "pages/search/search",
-        "pages/msg/msglist/msglist",
-        "pages/msg/msgdetail/msgdetail",
-        "pages/goodsdetail/goodsdetail",
-        "pages/cerserach/cerserach",
-        "pages/jewelry/jewelry"
+        "pages/bond/list/index",
+        "pages/bond/detail/index",
+        "pages/inspection/list/index",
+        "pages/inspection/detail/index",
+        "pages/calculator/index",
+        "pages/search/index",
+        "pages/msg/msglist/index",
+        "pages/msg/msgdetail/index",
+        "pages/goodsdetail/index",
+        "pages/cerserach/index",
+        "pages/jewelry/index"
       ]
     },
     {
       "root": "mMine",
       "name": "mMine",
       "pages": [
-        "pages/myinventorys/list/list",
-        "pages/myorders/list/list",
-        "pages/myorders/his/his",
-        "pages/bank/bank",
-        "pages/listingdetail/listingdetail",
-        "pages/address/list/list",
-        "pages/address/operate/operate",
-        "pages/invoice/list/list",
-        "pages/invoice/operate/operate",
-        "pages/about/about/about",
-        "pages/myperformance/list/list",
-        "pages/myperformance/his/his",
-        "pages/myperformance/detail/detail",
-        "pages/myperformance/modify/modify",
-        "pages/myperformance/breach/breach",
-        "pages/modifypwd/modifypwd",
-        "pages/inoutgold/inoutgold"
+        "pages/myinventorys/list/index",
+        "pages/myorders/list/index",
+        "pages/myorders/his/index",
+        "pages/bank/index",
+        "pages/listingdetail/index",
+        "pages/address/list/index",
+        "pages/address/operate/index",
+        "pages/invoice/list/index",
+        "pages/invoice/operate/index",
+        "pages/about/about/index",
+        "pages/myperformance/list/index",
+        "pages/myperformance/his/index",
+        "pages/myperformance/detail/index",
+        "pages/myperformance/modify/index",
+        "pages/myperformance/breach/index",
+        "pages/modifypwd/index",
+        "pages/inoutgold/index"
       ]
     },
     {
       "root": "mTrade",
       "name": "mTrade",
       "pages": [
-        "pages/listingbuy/listingbuy",
-        "pages/diadetail/diadetail",
-        "pages/buyinquiry/buyinquiry",
-        "pages/delistingbuy/delistingbuy",
-        "pages/delistingsell/delistingsell",
-        "pages/listingsell/listingsell",
-        "pages/orderdetail/orderdetail"
+        "pages/listingbuy/index",
+        "pages/diadetail/index",
+        "pages/buyinquiry/index",
+        "pages/delistingbuy/index",
+        "pages/delistingsell/index",
+        "pages/listingsell/index",
+        "pages/orderdetail/index"
       ]
     },
     {
       "root": "mCircle",
       "name": "mCircle",
       "pages": [
-        "pages/contrast/contrast"
+        "pages/contrast/index"
       ]
     }
   ],
@@ -112,7 +112,12 @@
     "van-cell": "@vant/weapp/cell/index",
     "van-cell-group": "@vant/weapp/cell-group/index",
     "van-loading": "@vant/weapp/loading/index",
-    "van-swipe-cell": "@vant/weapp/swipe-cell/index"
+    "van-swipe-cell": "@vant/weapp/swipe-cell/index",
+    "cat-view": "/layouts/view/index",
+    "cat-section": "/components/section/index",
+    "cat-button-back": "/components/button-back/index",
+    "cat-statusbar": "/components/statusbar/index",
+    "cat-navbar": "/components/navbar/index"
   },
   "window": {
     "backgroundTextStyle": "dark",
@@ -126,16 +131,16 @@
     "custom": true,
     "list": [
       {
-        "pagePath": "pages/home/home"
+        "pagePath": "pages/home/index"
       },
       {
-        "pagePath": "pages/circle/circle"
+        "pagePath": "pages/circle/index"
       },
       {
-        "pagePath": "pages/trade/trade"
+        "pagePath": "pages/trade/index"
       },
       {
-        "pagePath": "pages/mine/mine"
+        "pagePath": "pages/mine/index"
       }
     ]
   },

GuangZuan/miniprogram/app.less

@@ -1,5 +1,6 @@
 /**app.wxss**/
 @import '/miniprogram_npm/@vant/weapp/common/index.wxss';
+@import 'style/iconfont/iconfont.wxss';
 
 page {
   font-family: -apple-system, BlinkMacSystemFont, 'Helvetica Neue', Helvetica,

GuangZuan/miniprogram/app.ts

@@ -18,18 +18,5 @@ App({
       },
       fail: () => {}
     })
-
-    // 展示本地存储能力
-    const logs = wx.getStorageSync('logs') || []
-    logs.unshift(Date.now())
-    wx.setStorageSync('logs', logs)
-
-    // 登录
-    wx.login({
-      success: res => {
-        console.log(res)
-        // 发送 res.code 到后台换取 openId, sessionKey, unionId
-      },
-    })
   },
 })

GuangZuan/miniprogram/components/button-back/index.json

@@ -0,0 +1,7 @@
+{
+    "component": true,
+    "styleIsolation": "apply-shared",
+    "usingComponents": {
+        "van-icon": "@vant/weapp/icon"
+    }
+}

GuangZuan/miniprogram/components/button-back/index.less

@@ -0,0 +1,35 @@
+.cat-button-back {
+    z-index: 1000;
+    left: 10rpx;
+
+    &.fixed {
+        .cat-icon {
+            &::before {
+                font-size: 32rpx;
+                background-color: rgba(0, 0, 0, .5);
+                border-radius: 50%;
+                padding: 16rpx;
+            }
+
+            &.dark::before {
+                background-color: rgba(255, 255, 255, .75)
+            }
+        }
+    }
+
+    .cat-icon {
+        color: #fff;
+        width: var(--navigationBarHeight);
+        height: var(--navigationBarHeight);
+
+        &::before {
+            content: var(--icon-arrow-left);
+            font-size: 40rpx;
+            font-weight: bold;
+        }
+
+        &.dark {
+            color: #333;
+        }
+    }
+}

GuangZuan/miniprogram/components/button-back/index.ts

@@ -0,0 +1,42 @@
+import { getStatusBarHeight } from '../../store/index'
+
+Component({
+    externalClasses: ['custom-class'],
+    properties: {
+        // 返回的页数
+        go: {
+            type: Number,
+            value: 1,
+        },
+        // 是否固定位置
+        fixed: {
+            type: Boolean,
+            value: false,
+        },
+        dark: {
+            type: Boolean,
+            value: false,
+        },
+    },
+    data: {
+        styles: '',
+    },
+    methods: {
+        // 关闭当前页面，返回上一页面或多级页面
+        navigateBack() {
+            wx.navigateBack({
+                delta: this.data.go,
+            });
+        }
+    },
+    attached() {
+        const styles: string[] = []
+        if (this.data.fixed) {
+            styles.push('position:fixed')
+            styles.push('top:' + getStatusBarHeight() + 'px')
+        }
+        this.setData({
+            styles: styles.join(';'),
+        })
+    }
+})

GuangZuan/miniprogram/components/button-back/index.wxml

@@ -0,0 +1,3 @@
+<view class="cat-button-back custom-class {{fixed ? 'fixed' : ''}}" style="{{styles}}">
+    <button class="cat-button-icon cat-icon {{dark ? 'dark' : 'light'}}" bindtap="navigateBack"></button>
+</view>

GuangZuan/miniprogram/components/input-number/index.json

@@ -0,0 +1,5 @@
+{
+    "component": true,
+    "styleIsolation": "shared",
+    "usingComponents": {}
+}

GuangZuan/miniprogram/components/input-number/index.less

@@ -0,0 +1,39 @@
+.cat-inputnumber {
+    display: flex;
+    align-items: center;
+
+    &__button {
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        width: 56rpx !important;
+        height: 56rpx;
+        line-height: 0;
+        padding: 0;
+        margin: 0;
+
+        &:not([size='mini']) {
+            margin: 0;
+        }
+
+        &.minus {
+            border-top-right-radius: 0;
+            border-bottom-right-radius: 0;
+        }
+
+        &.plus {
+            border-top-left-radius: 0;
+            border-bottom-left-radius: 0;
+        }
+    }
+
+    &__input {
+        width: 90rpx;
+        height: 56rpx;
+        font-size: 24rpx;
+        font-weight: bold;
+        text-align: center;
+        background-color: #f2f2f2;
+        margin: 0 4rpx;
+    }
+}

GuangZuan/miniprogram/components/input-number/index.ts

@@ -0,0 +1,172 @@
+// 赶进度待优化
+Component({
+    properties: {
+        value: {
+            type: null,
+            value: 0,
+            observer() {
+                this.updated()
+            }
+        },
+        //最小数值
+        min: {
+            type: Number,
+            value: -999999
+        },
+        //最大数值
+        max: {
+            type: Number,
+            value: 999999,
+            observer() {
+                this.updated()
+            }
+        },
+        //递增或递减步长
+        step: {
+            type: Number,
+            value: 1
+        },
+        //是否禁用
+        disabled: {
+            type: Boolean,
+            value: false
+        },
+        //是否禁用输入
+        disabledInput: {
+            type: Boolean,
+            value: false
+        },
+        //是否整数
+        integer: {
+            type: Boolean,
+            value: false
+        }
+    },
+    data: {
+        disabledMinus: false,
+        disabledAdd: false
+    },
+    methods: {
+        //数据更新
+        updated() {
+            const val = this.data.value
+            if (val == '' || isNaN(val)) return
+
+            if (val <= this.data.min) {
+                this.setData({
+                    disabledMinus: true,
+                    value: this.data.min
+                })
+            } else {
+                this.setData({
+                    disabledMinus: false
+                })
+            }
+
+            if (val >= this.data.max) {
+                this.setData({
+                    disabledAdd: true,
+                    value: this.data.max
+                })
+            } else {
+                this.setData({
+                    disabledAdd: false
+                })
+            }
+        },
+        //实时监听input输入
+        inputChange(e: WechatMiniprogram.Input) {
+            this.setData({
+                value: e.detail.value
+            })
+        },
+        //计算精度
+        fixedFloat(a: number, b: number, sign: string) {
+            const handle = (x: number): [string, number] => {
+                let y = String(x)
+                let p = y.lastIndexOf('.')
+                if (p === -1) {
+                    return [y, 0]
+                } else {
+                    return [y.replace('.', ''), y.length - p - 1]
+                }
+            }
+            // v 操作数1, w 操作数2, s 操作符, t 精度
+            const operate = (v: number, w: number, s: string, t: number) => {
+                switch (s) {
+                    case '+':
+                        return (v + w) / t
+                    case '-':
+                        return (v - w) / t
+                    case '*':
+                        return (v * w) / (t * t)
+                    case '/':
+                        return (v / w)
+                    default:
+                        return 0
+                }
+            }
+
+            const padding0 = (p: number) => {
+                var z = ''
+                while (p--) {
+                    z += '0'
+                }
+                return z
+            }
+
+            const c: [string, number] = handle(a)
+            const d: [string, number] = handle(b)
+            let k = 0
+
+            if (c[1] === 0 && d[1] === 0) {
+                return operate(+c[0], +d[0], sign, 1)
+            } else {
+                k = Math.pow(10, Math.max(c[1], d[1]))
+                if (c[1] !== d[1]) {
+                    if (c[1] > d[1]) {
+                        d[0] += padding0(c[1] - d[1])
+                    } else {
+                        c[0] += padding0(d[1] - c[1])
+                    }
+                }
+                return operate(+c[0], +d[0], sign, k)
+            }
+        },
+        minus() {
+            this.setData({
+                value: this.fixedFloat(this.data.value, this.data.step, '-')
+            }, () => {
+                this.triggerEvent('change', this.data.value)
+            })
+        },
+        add() {
+            this.setData({
+                value: this.fixedFloat(this.data.value, this.data.step, '+')
+            }, () => {
+                this.triggerEvent('change', this.data.value)
+            })
+        },
+        //失去焦点
+        inputBlur() {
+            if (this.data.value === '' || isNaN(this.data.value)) {
+                if (this.data.min > 0) {
+                    this.setData({
+                        value: this.data.min
+                    })
+                } else {
+                    this.setData({
+                        value: this.data.max < 0 ? this.data.max : 0
+                    })
+                }
+            } else {
+                if (this.data.integer) {
+                    this.setData({
+                        value: parseInt(this.data.value)
+                    })
+                }
+            }
+            this.triggerEvent('change', this.data.value)
+        }
+    }
+})

GuangZuan/miniprogram/components/input-number/index.wxml

@@ -0,0 +1,5 @@
+<view class="cat-inputnumber">
+	<button class="cat-inputnumber__button minus" disabled="{{disabled || disabledMinus}}" catchtap="minus">-</button>
+	<input class="cat-inputnumber__input" type="number" disabled="{{disabled || disabledInput}}" value="{{value}}" bindinput="inputChange" bindblur="inputBlur"></input>
+	<button class="cat-inputnumber__button plus" disabled="{{disabled || disabledAdd}}" catchtap="add">+</button>
+</view>

GuangZuan/miniprogram/components/nav-bar/nav-bar.less

@@ -1 +0,0 @@
-/* components/nav-bar/nav-bar.wxss */

GuangZuan/miniprogram/components/nav-bar/nav-bar.wxml

@@ -1,4 +1,3 @@
-<!--components/nav-bar/nav-bar.wxml-->
 <van-nav-bar custom-style="background-color: #E92020">
   <van-icon wx:if="{{left}}" slot="left" name="arrow-left" size="25px" color="white"/>
   <text slot="title" style="color: white;">{{title}}</text>

GuangZuan/miniprogram/components/navbar/index.json

@@ -0,0 +1,5 @@
+{
+    "component": true,
+    "styleIsolation": "apply-shared",
+    "usingComponents": {}
+}

GuangZuan/miniprogram/components/navbar/index.less

@@ -0,0 +1,42 @@
+.cat-navbar {
+    width: 100%;
+    color: #fff;
+    background: linear-gradient(180deg, #FE3C3D 0%, #FD566D 100%);
+
+    &__statusbar {
+        background-color: transparent !important;
+    }
+
+    &__container {
+        display: flex;
+        font-size: 36rpx;
+
+        .left,
+        .center,
+        .right {
+            flex: 1;
+            display: inline-flex;
+            justify-content: center;
+            align-items: center;
+            height: var(--navigationBarHeight);
+        }
+
+        .left {
+            >.block {
+                margin-right: auto;
+                margin-left: 10rpx;
+            }
+        }
+
+        .right {
+            >.block {
+                margin-left: auto;
+                margin-right: 10rpx;
+            }
+        }
+    }
+
+    &__footer:empty {
+        display: none;
+    }
+}

GuangZuan/miniprogram/components/navbar/index.ts

@@ -0,0 +1,18 @@
+Component({
+    externalClasses: ['custom-class'],
+    options: {
+        multipleSlots: true,
+    },
+    properties: {
+        title: String,
+        // 是否显示返回按钮
+        showBackButton: {
+            type: Boolean,
+            value: true,
+        },
+    },
+    data: {
+    },
+    methods: {
+    },
+})

GuangZuan/miniprogram/components/navbar/index.wxml

@@ -0,0 +1,25 @@
+<view class="cat-navbar custom-class">
+    <cat-statusbar custom-class="cat-navbar__statusbar"></cat-statusbar>
+    <view class="cat-navbar__container">
+        <view class="left">
+            <view class="block">
+                <cat-button-back wx:if="{{showBackButton}}"></cat-button-back>
+                <slot name="left"></slot>
+            </view>
+        </view>
+        <view class="center">
+            <view class="block">
+                <span wx:if="{{title}}">{{title}}</span>
+                <slot wx:else></slot>
+            </view>
+        </view>
+        <view class="right">
+            <view class="block">
+                <slot name="right"></slot>
+            </view>
+        </view>
+    </view>
+</view>
+<view class="cat-navbar__footer">
+    <slot name="footer"></slot>
+</view>

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

@@ -1,5 +1,3 @@
-/* components/num-range/num-range.wxss */
-
 .content {
   display: flex;
   justify-content: space-around;

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

@@ -1,5 +1,3 @@
-<!--components/num-range/num-range.wxml-->
-
 <view class="content">
   <!-- 左边视图 -->
   <view class="left">

GuangZuan/miniprogram/components/rate/index.json

@@ -0,0 +1,4 @@
+{
+    "component": true,
+    "usingComponents": {}
+}

GuangZuan/miniprogram/components/rate/index.less

@@ -0,0 +1,27 @@
+.cat-rate {
+    display: flex;
+    align-items: center;
+
+    &__level {
+        display: flex;
+        align-items: center;
+
+        .cat-icon {
+            margin-right: 4rpx;
+
+            &::before {
+                content: var(--icon-star);
+                font-size: 16rpx;
+            }
+        }
+
+        .cat-icon.active::before {
+            color: var(--color-primary);
+            content: var(--icon-star-filled);
+        }
+    }
+
+    &__label {
+        color: #777;
+    }
+}

GuangZuan/miniprogram/components/rate/index.ts

@@ -0,0 +1,41 @@
+Component({
+    externalClasses: ['custom-class'],
+    properties: {
+        // 评分值
+        value: {
+            type: Number,
+            value: 5
+        },
+        // 评分数量
+        count: {
+            type: Number,
+            value: 5
+        },
+        // 评分标签
+        label: {
+            type: Array,
+            value: ['非常差', '较差', '一般', '满意', '非常满意']
+        },
+        // 是否禁用
+        disabled: {
+            type: Boolean,
+            value: false
+        }
+    },
+    data: {
+    },
+    methods: {
+        //选择评分等级
+        onChange(e:any) {
+            if (!this.data.disabled) {
+                this.setData({
+                    value: e.currentTarget.dataset.index + 1
+                }, () => {
+                    this.triggerEvent('change', {
+                        value: this.data.value
+                    })
+                })
+            }
+        }
+    }
+})

GuangZuan/miniprogram/components/rate/index.wxml

@@ -0,0 +1,8 @@
+<view class="cat-rate custom-class">
+  <view class="cat-rate__level">
+    <block wx:for="{{count}}" wx:key="key">
+      <text class="cat-icon {{index < value ? 'active' : ''}}" bindtap="onChange" data-index="{{index}}"></text>
+    </block>
+  </view>
+  <view class="cat-rate__label" hidden>{{label[value - 1]}}</view>
+</view>

GuangZuan/miniprogram/components/section/index.json

@@ -0,0 +1,5 @@
+{
+    "component": true,
+    "styleIsolation": "apply-shared",
+    "usingComponents": {}
+}

GuangZuan/miniprogram/components/section/index.less

@@ -0,0 +1,13 @@
+.cat-section {
+    background-color: #fff;
+    margin-bottom: 20rpx;
+    overflow: hidden;
+
+    &__title {
+        display: flex;
+
+        &:empty {
+            display: none;
+        }
+    }
+}

GuangZuan/miniprogram/components/section/index.ts

@@ -0,0 +1,46 @@
+Component({
+    externalClasses: ['custom-class'],
+    options: {
+        multipleSlots: true,
+    },
+    properties: {
+        // 圆角大小
+        round: {
+            type: String,
+            value: 'none',
+        },
+        // 外边距
+        margin: {
+            type: Boolean,
+            value: false,
+        }
+    },
+    data: {
+        styles: '',
+    },
+    methods: {
+    },
+    attached() {
+        const styles: string[] = []
+
+        if (this.data.margin) {
+            styles.push('margin-left:24rpx')
+            styles.push('margin-right:24rpx')
+        }
+
+        switch (this.data.round) {
+            case 'normal': {
+                styles.push('border-radius:20rpx')
+                break;
+            }
+            case 'small': {
+                styles.push('border-radius:10rpx')
+                break;
+            }
+        }
+
+        this.setData({
+            styles: styles.join(';')
+        })
+    }
+})

GuangZuan/miniprogram/components/section/index.wxml

@@ -0,0 +1,8 @@
+<view class="cat-section custom-class" style="{{styles}}">
+    <view class="cat-section__title">
+        <slot name="title"></slot>
+    </view>
+    <view class="cat-section__container">
+        <slot></slot>
+    </view>
+</view>

GuangZuan/miniprogram/components/statusbar/index.json

@@ -0,0 +1,5 @@
+{
+    "component": true,
+    "styleIsolation": "apply-shared",
+    "usingComponents": {}
+}

GuangZuan/miniprogram/components/statusbar/index.less

@@ -0,0 +1,4 @@
+.cat-statusbar{
+    font-size: 0;
+    line-height: 0;
+}

GuangZuan/miniprogram/components/statusbar/index.ts

@@ -0,0 +1,35 @@
+import { getStatusBarHeight } from '../../store/index'
+
+Component({
+    externalClasses: ['custom-class'],
+    properties: {
+        // 状态栏背景颜色
+        backgroundColor: {
+            type: String,
+            value: '#ffffff',
+        },
+        dark: {
+            type: Boolean,
+            value: false,
+        },
+    },
+    data: {
+        styles: ''
+    },
+    attached() {
+        const styles = []
+        styles.push('padding-top:' + getStatusBarHeight() + 'px')
+        styles.push('background-color:' + this.data.backgroundColor)
+
+        this.setData({
+            styles: styles.join(';')
+        })
+
+        if (this.data.dark) {
+            wx.setNavigationBarColor({
+                frontColor: '#000000',
+                backgroundColor: '#ffffff',
+            })
+        }
+    }
+})

GuangZuan/miniprogram/components/statusbar/index.wxml

@@ -0,0 +1,3 @@
+<view class="cat-statusbar custom-class" style="{{styles}}">
+    <slot></slot>
+</view>

GuangZuan/miniprogram/components/tabbar/index.less

@@ -0,0 +1,47 @@
+.cat-tabbar {
+    height: 100rpx;
+    background-color: #fff;
+
+    &__wrapper {
+        bottom: 0;
+        display: flex;
+        width: 100%;
+        height: ~"calc(100rpx - 1rpx)";
+        border-top: 1rpx solid #eee;
+        box-sizing: content-box;
+    }
+
+    &__item {
+        flex: 1;
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+        align-items: center;
+        height: inherit;
+        cursor: pointer;
+
+        .cat-icon {
+            display: flex;
+            flex-direction: column;
+            justify-content: center;
+            align-items: center;
+
+            .image {
+                width: 56rpx;
+                height: 56rpx;
+                object-fit: contain;
+            }
+
+            .text {
+                font-size: 20rpx;
+                margin-top: 5rpx;
+            }
+
+            &:before {
+                width: 56rpx;
+                height: 56rpx;
+                font-size: 56rpx;
+            }
+        }
+    }
+}

GuangZuan/miniprogram/components/tabbar/index.ts

@@ -0,0 +1,24 @@
+Component({
+    options: {
+        multipleSlots: true, // 在组件定义时的选项中启用多slot支持
+    },
+    properties: {
+        tabs: {
+            type: Array,
+            value: [],
+        },
+        fixed: {
+            type: Boolean,
+            value: false,
+        },
+    },
+    data: {
+        active:0,
+    },
+    methods: {
+        // 切换标签
+        changeTab(e: any) {
+            console.log(e)
+        }
+    }
+})

GuangZuan/miniprogram/components/tabbar/index.wxml

@@ -0,0 +1,21 @@
+<view class="cat-tabbar">
+    <view class="cat-tabbar__wrapper" style="{{fixed ? 'position: fixed;' : ''}}">
+        <block wx:for="{{tabs}}" wx:for-index="index" wx:key="index" wx:for-item="item">
+            <view class="cat-tabbar__item" bindtap="changeTab">
+                <!--判断是否图片图标-->
+                <block wx:if="{{item.icon}}">
+                    <view class="cat-icon {{['cat-icon-' + item.name, active === index ? 'active' : '']}}">
+                        <image class="image" src="{{item.icon.active}}" wx:if="{{active === index}}"></image>
+                        <image class="image" src="{{item.icon.inactive}}" wx:else></image>
+                        <text class="text">{{ item.label }}</text>
+                    </view>
+                </block>
+                <block wx:else>
+                    <view class="cat-icon {{['cat-icon-' + item.name, active === index ? 'active' : '']}}">
+                        <text class="text">{{ item.label }}</text>
+                    </view>
+                </block>
+            </view>
+        </block>
+    </view>
+</view>

GuangZuan/miniprogram/constants/enum/echarts.ts

@@ -20,4 +20,7 @@ export enum EChartsSeriesType {
     VOL,
     KDJ,
     CCI,
-}
+}
+
+/// 按钮背景色
+export const color_btn_bg = "226FD9"

GuangZuan/miniprogram/constants/enum/funcode.ts

@@ -40,6 +40,8 @@ export enum FunCode {
     T2bBankWithdrawRsp   = 589838,     // 出金应答
     T2bBankDepositReq    = 589843,     // 入金请求
     T2bBankDepositRsp    = 589844,     // 入金应答
+    AccountFundInfoReq = 262150,       /// 账户资金信息请求(0, 4, 6)
+    AccountFundInfoRsp = 262151,       /// 账户资金信息响应(0, 4, 7)
 
     WarehouseApplyReq                   = 1900685, // 仓库申请请求
     WarehouseApplyRsp                   = 1900686, // 仓库申请应答

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

@@ -1 +0,0 @@
-/* custom-tab-bar/index.wxss */

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

@@ -16,28 +16,28 @@ Component({
    */
   data: {
     active: 0,
-    color: '#7d7e80',
-    activeColor: '#D42A26',
+    color: '#888888',
+    activeColor: '#387BDC',
     list: [
 			{
 				icon: 'wap-home',
 				text: '首页',
-				url: '/pages/home/home'
+				url: '/pages/home/index'
       },
       {
 				icon: 'balance-list',
-				text: '钻石交易',
-				url: '/pages/trade/trade'
+				text: '挂牌大厅',
+				url: '/pages/trade/index'
 			},
       {
 				icon: 'gem',
 				text: '钻石圈',
-				url: '/pages/circle/circle'
+				url: '/pages/circle/index'
       },
 			{
 				icon: 'manager',
 				text: '我的',
-				url: '/pages/mine/mine'
+				url: '/pages/mine/index'
 			}
 		]
   },

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

@@ -1,5 +1,3 @@
-<!--custom-tab-bar/index.wxml-->
-
 <van-tabbar active="{{ active }}" active-color="{{activeColor}}" inactive-color="{{color}}" bind:change="onChange">
   <van-tabbar-item wx:for="{{ list }}" wx:key="index" icon="{{ item.icon }}">{{
     item.text

GuangZuan/miniprogram/layouts/scroll-view/index.json

@@ -0,0 +1,4 @@
+{
+    "component": true,
+    "usingComponents": {}
+}

GuangZuan/miniprogram/layouts/scroll-view/index.less

@@ -0,0 +1,3 @@
+.cat-scroll-view {
+    height: 100%;
+}

GuangZuan/miniprogram/layouts/scroll-view/index.ts

@@ -0,0 +1,18 @@
+Component({
+    externalClasses: ['custom-class'],
+    options: {
+
+    },
+    properties: {
+
+    },
+    data: {
+
+    },
+    methods: {
+        // 监听滚动条滚动事件
+        onScroll(e: any) {
+            this.triggerEvent('scroll', e.detail) // 调用父组件事件
+        }
+    }
+})

GuangZuan/miniprogram/layouts/scroll-view/index.wxml

@@ -0,0 +1,3 @@
+<scroll-view class="cat-scroll-view custom-class" scroll-y="{{true}}" bindscroll="onScroll">
+    <slot></slot>
+</scroll-view>

GuangZuan/miniprogram/layouts/view/index.json

@@ -0,0 +1,7 @@
+{
+    "component": true,
+    "styleIsolation": "apply-shared",
+    "usingComponents": {
+        "cat-scroll-view": "/layouts/scroll-view"
+    }
+}

GuangZuan/miniprogram/layouts/view/index.less

@@ -0,0 +1,38 @@
+.cat-view {
+    display: flex;
+    flex-direction: column;
+    height: 100%;
+
+    &__container {
+        flex: 1;
+        display: flex;
+        flex-direction: column;
+        overflow-y: auto;
+        -webkit-overflow-scrolling: touch;
+
+        &-navbar {
+            width: 100%;
+
+            &.fixed {
+                position: fixed;
+                z-index: 1000;
+                top: 0;
+                left: 0;
+            }
+        }
+
+        &-main {
+            flex: 1;
+            overflow-y: auto;
+            -webkit-overflow-scrolling: touch;
+        }
+    }
+
+    &__footer {
+        background-color: #fff;
+
+        &:empty {
+            display: none;
+        }
+    }
+}

GuangZuan/miniprogram/layouts/view/index.ts

@@ -0,0 +1,90 @@
+import { getStatusBarHeight } from '../../store/index'
+
+Component({
+    externalClasses: ['custom-class'],
+    options: {
+        multipleSlots: true, // 在组件定义时的选项中启用多slot支持
+    },
+    properties: {
+        // 是否显示返回按钮
+        showBackButton: {
+            type: Boolean,
+            value: false,
+        },
+        // 是否固定导航栏
+        navBarFixed: {
+            type: Boolean,
+            value: false,
+        },
+        // 导航栏固定时状态栏颜色
+        statusBarFixedStyle: {
+            type: Object,
+            value: <WechatMiniprogram.SetNavigationBarColorOption>{
+                frontColor: '#000000',
+                backgroundColor: '#ffffff',
+            },
+        },
+        // 页面滚动时状态栏颜色
+        statusBarScrollStyle: {
+            type: Object,
+            value: <WechatMiniprogram.SetNavigationBarColorOption>{
+                frontColor: '#ffffff',
+                backgroundColor: '#fd4c58',
+            },
+        }
+    },
+    data: {
+        backButtonOpacity: 1, // 返回按钮透明度，(scrollHeight - scrollTop) / scrollHeight
+        navBarOpacity: 0, // 导航栏透明度
+        statusBarHeight: getStatusBarHeight(),
+    },
+    methods: {
+        // 设置状态栏颜色
+        setStatusBarStyle(option: Object) {
+            const style = option as WechatMiniprogram.SetNavigationBarColorOption
+            wx.setNavigationBarColor(style)
+        },
+        // 监听滚动条滚动事件
+        onScroll(e: any) {
+            if (this.data.navBarFixed) {
+                const scrollTop = e.detail.scrollTop
+                const scrollHeight = 100 // 最大滚动高度
+                const statusBarHeight = this.data.statusBarHeight
+                const navBarOpacity = (scrollTop - statusBarHeight) / scrollHeight // 计算透明度
+
+                // 待优化
+                // if (navBarOpacity < 1.5) {
+                //     this.setData({
+                //         navBarOpacity,
+                //     }, () => {
+                //         if (navBarOpacity > 0.5) {
+                //             this.setStatusBarStyle(this.data.statusBarScrollStyle)
+                //         } else {
+                //             this.setStatusBarStyle(this.data.statusBarFixedStyle)
+                //         }
+                //     })
+                // }
+
+                // 暂时解决方案
+                if (this.data.navBarOpacity === 0 && navBarOpacity > 1) {
+                    this.setData({
+                        navBarOpacity: 1,
+                    }, () => {
+                        this.setStatusBarStyle(this.data.statusBarScrollStyle)
+                    })
+                } else if (this.data.navBarOpacity === 1 && navBarOpacity < 1) {
+                    this.setData({
+                        navBarOpacity: 0,
+                    }, () => {
+                        this.setStatusBarStyle(this.data.statusBarFixedStyle)
+                    })
+                }
+            }
+        }
+    },
+    attached() {
+        if (this.data.navBarFixed) {
+            this.setStatusBarStyle(this.data.statusBarFixedStyle)
+        }
+    }
+})

GuangZuan/miniprogram/layouts/view/index.wxml

@@ -0,0 +1,18 @@
+<view class="cat-view custom-class">
+    <cat-button-back wx:if="{{showBackButton}}" fixed dark></cat-button-back>
+    <view class="cat-view__header">
+        <slot name="header"></slot>
+    </view>
+    <view class="cat-view__container">
+        <cat-statusbar background-color="{{statusBarFixedStyle.backgroundColor}}" wx:if="{{navBarFixed}}"></cat-statusbar>
+        <view class="cat-view__container-navbar {{navBarFixed ? 'fixed' : ''}}" style="opacity:{{navBarFixed ? navBarOpacity : 1}}">
+            <slot name="navbar"></slot>
+        </view>
+        <cat-scroll-view class="cat-view__container-main" bind:scroll="onScroll">
+            <slot></slot>
+        </cat-scroll-view>
+    </view>
+    <view class="cat-view__footer">
+        <slot name="footer"></slot>
+    </view>
+</view>

GuangZuan/miniprogram/mCircle/pages/contrast/contrast.less → GuangZuan/miniprogram/mCircle/pages/contrast/index.less

@@ -1,5 +1,3 @@
-/* mCircle/pages/contrast/contrast.wxss */
-
 .top-view {
   position: sticky;
   top: 0;

GuangZuan/miniprogram/mCircle/pages/contrast/contrast.ts → GuangZuan/miniprogram/mCircle/pages/contrast/index.ts

@@ -1,4 +1,4 @@
-// mCircle/pages/contrast/contrast.ts
+// mCircle/pages/contrast/index.ts
 Page({
 
   /**

GuangZuan/miniprogram/mCircle/pages/contrast/contrast.wxml → GuangZuan/miniprogram/mCircle/pages/contrast/index.wxml

@@ -1,5 +1,3 @@
-<!--mCircle/pages/contrast/contrast.wxml-->
-
 <!-- top-view -->
 <view class="top-view">
   <!-- 导航栏 -->

GuangZuan/miniprogram/mHome/pages/bond/detail/detail.less → GuangZuan/miniprogram/mHome/pages/bond/detail/index.less

@@ -1,5 +1,3 @@
-/* mHome/pages/bond/detail/detail.wxss */
-
 .top-view {
   position: sticky;
   top: 0px;

GuangZuan/miniprogram/mHome/pages/bond/detail/detail.ts → GuangZuan/miniprogram/mHome/pages/bond/detail/index.ts

@@ -1,4 +1,4 @@
-// mHome/pages/bond/detail/detail.ts
+// mHome/pages/bond/detail/index.ts
 Page({
 
   /**

GuangZuan/miniprogram/mHome/pages/bond/detail/detail.wxml → GuangZuan/miniprogram/mHome/pages/bond/detail/index.wxml

@@ -1,4 +1,3 @@
-<!--mHome/pages/bond/detail/detail.wxml-->
 <!-- top-view -->
 <view class="top-view">
   <!-- 导航栏 -->

GuangZuan/miniprogram/mHome/pages/bond/list/list.less → GuangZuan/miniprogram/mHome/pages/bond/list/index.less

@@ -1,5 +1,3 @@
-/* mHome/pages/bond/list/list.wxss */
-
 .top-view {
   position: sticky;
   top: 0px;

GuangZuan/miniprogram/mHome/pages/bond/list/list.ts → GuangZuan/miniprogram/mHome/pages/bond/list/index.ts

@@ -1,4 +1,4 @@
-// mHome/pages/bond/list/list.ts
+// mHome/pages/bond/list/index.ts
 
 import Toast from "../../../../miniprogram_npm/@vant/weapp/toast/toast"
 import { queryGZBSFWOrder } from "../../../../services/api/trade/index"

GuangZuan/miniprogram/mHome/pages/bond/list/list.wxml → GuangZuan/miniprogram/mHome/pages/bond/list/index.wxml

@@ -1,4 +1,3 @@
-<!--mHome/pages/bond/list/list.wxml-->
 <!-- top-view -->
 <view class="top-view">
   <!-- 导航栏 -->
@@ -9,7 +8,7 @@
 
   <!-- tabs -->
   <view class="tab-view">
-    <van-tabs sticky animated bind:change="onTabChange">
+    <van-tabs sticky animated bind:change="onTabChange" color="#2270D9" title-active-color="#2270D9" title-inactive-color="#8F8AA6">
       <van-tab wx:for="{{tabs}}" wx:for-item="itm" wx:key="id" id="{{itm.id}}" title="{{itm.name}}"/>
     </van-tabs>  
   </view>

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

@@ -1,5 +1,3 @@
-/* mHome/pages/calculator/calculator.wxss */
-
 .container {
   display: flex;
   flex-direction: column;
@@ -78,7 +76,7 @@
     margin-top: 20px;
   
     button {
-      width: 70%;
+      width: 95%;
       color: white;
       background-color: red;
     }

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

@@ -1,7 +1,7 @@
 import Toast from "../../../miniprogram_npm/@vant/weapp/toast/toast"
 import { priceCalc } from "../../../services/api/orders/index"
 
-// mHome/pages/calculator/calculator.ts
+// mHome/pages/calculator/index.ts
 Page({
 
   /**
@@ -105,6 +105,7 @@ Page({
     const ids = (<string> e.target.id).split(' ')
     let id = (<string> e.target.id).split(' ')[0]
     const index = <number> <unknown>ids[1]
+    console.log(id, index)
 
     switch (id) {
       case 'zsshape':   /// 形状
@@ -122,27 +123,29 @@ Page({
         })
         break;
       case 'zscolor':   /// 颜色
-        this.setData({ colors: this.data.zscolors.map(item => {
-          if (item.id == index) {
-            item.isCheck = true
-            /// 设置形状
-            this.setData({ zscolor: item.name })
-          } else {
-            item.isCheck = false
-          }
-          return item
+        this.setData({ 
+          zscolors: this.data.zscolors.map(item => {
+            if (item.id == index) {
+              item.isCheck = true
+              /// 设置形状
+              this.setData({ zscolor: item.name })
+            } else {
+              item.isCheck = false
+            }
+            return item
         }) })
         break;
       case 'zsclarity':   /// 净度
-        this.setData({ neatness: this.data.zsclaritys.map(item => {
-          if (item.id == index) {
-            item.isCheck = true
-            /// 设置形状
-            this.setData({ zsclarity: item.name })
-          } else {
-            item.isCheck = false
-          }
-          return item
+        this.setData({ 
+          zsclaritys: this.data.zsclaritys.map(item => {
+            if (item.id == index) {
+              item.isCheck = true
+              /// 设置形状
+              this.setData({ zsclarity: item.name })
+            } else {
+              item.isCheck = false
+            }
+            return item
         }) })
         break;
       default:  /// 计算

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

@@ -1,5 +1,3 @@
-<!--mHome/pages/calculator/calculator.wxml-->
-
 <!-- 导航栏 -->
 <van-nav-bar custom-style="background-color: #E92020">
   <van-icon slot="left" name="arrow-left" size="25px" color="white" bind:click="backToParent"/>

GuangZuan/miniprogram/mHome/pages/cerserach/cerserach.less

@@ -1,40 +0,0 @@
-/* mHome/pages/cerserach/cerserach.wxss */
-
-.tab-view {
-  position: sticky;
-  top: 0;
-  z-index: 999;
-}
-
-.cers {
-  display: flex;
-  flex-direction: row;
-  flex-wrap: wrap;
-  margin-top: 15px;
-  justify-content: space-around;
-
-  button {
-    width: 23%;
-    font-size: 13px;
-    margin-bottom: 10px;
-  }
-
-  /* 选中时添加这个 样式 */
-  .active {
-    background: #dae9fd;
-  }
-  
-   /* 三角形 */
-  .active::before {
-    content: '';
-    display: inline-block;
-    position: absolute;
-    right: 0;
-    bottom: 0;
-    width: 0;
-    height: 0;
-    border-bottom: 15px solid rebeccapurple;
-    border-left: 14px solid transparent; 
-  }
-
-}

GuangZuan/miniprogram/mHome/pages/cerserach/cerserach.ts

@@ -1,135 +0,0 @@
-// mHome/pages/cerserach/cerserach.ts
-Page({
-
-  /**
-   * 页面的初始数据
-   */
-  data: {
-    /// tabs
-    tabs: [{id: 1, name: '国际'}, 
-           {id: 2, name: '国内'}],
-    /// tab索引
-    active: 0,
-    /// 国际证书
-    ncers: [{id: 1, name: 'GIA', isCheck: true}, 
-            {id: 2, name: 'IGI', isCheck: false}, 
-            {id: 3, name: 'EGL', isCheck: false}, 
-            {id: 4, name: 'HRD', isCheck: false}, 
-            {id: 5, name: 'GRS', isCheck: false}, 
-            {id: 6, name: 'AGS', isCheck: false}, 
-            {id: 7, name: 'Gubelin', isCheck: false}, 
-            {id: 8, name: 'LOTUS', isCheck: false}, 
-            {id: 9, name: 'AIGS', isCheck: false}],
-    /// 国内证书
-    icers: [{id: 1, name: 'NGTC', isCheck: true}, 
-            {id: 2, name: 'BEIDA', isCheck: false}, 
-            {id: 3, name: 'GTC', isCheck: false}, 
-            {id: 4, name: 'GIC', isCheck: false}, 
-            {id: 5, name: 'NJQSIC', isCheck: false}, 
-            {id: 6, name: 'CCGTC', isCheck: false}, 
-            {id: 7, name: 'NGSTC', isCheck: false}, 
-            {id: 8, name: 'GDTC', isCheck: false}, 
-            {id: 9, name: 'NGDTC', isCheck: false}, 
-            {id: 10, name: 'CQT', isCheck: false}, 
-            {id: 11, name: 'GIB', isCheck: false}, 
-            {id: 12, name: 'CGJC', isCheck: false}, 
-            {id: 13, name: 'GGC', isCheck: false}]
-  },
-
-  /**
-   * tab触发事件
-   */
-  onTabChange(e: any) {
-    this.setData({
-      active: e.detail.index
-    })
-  },
-
-  /**
-   * 返回上层视图
-   */
-  backToParent() {
-    /// 返回上层视图
-    wx.navigateBack()
-  },
-
-  /// 形状按钮点击事件
-  onButtonPressed(e: any) {
-    const index = e.target.id
-    this.data.active == 0 ? this.setData({
-      ncers: this.data.ncers.map(item => {
-        if (item.id == index) {
-          item.isCheck = true
-        } else {
-          item.isCheck = false
-        }
-        return item
-      }) 
-    }) : this.setData({
-      icers: this.data.icers.map(item => {
-        if (item.id == index) {
-          item.isCheck = true
-        } else {
-          item.isCheck = false
-        }
-        return item
-      }) 
-    })
-  },
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload() {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh() {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom() {
-
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage() {
-
-  }
-})

GuangZuan/miniprogram/mHome/pages/cerserach/cerserach.wxml

@@ -1,19 +0,0 @@
-<!--mHome/pages/cerserach/cerserach.wxml-->
-
-<!-- 导航栏 -->
-<van-nav-bar custom-style="background-color: #E92020">
-  <van-icon slot="left" name="arrow-left" size="25px" color="white" bind:click="backToParent"/>
-  <text slot="title" style="color: white;">钻石证书查询</text>
-</van-nav-bar>
-
-<!-- tabs -->
-<view class="tab-view">
-  <van-tabs swipeable bind:change="onTabChange">
-    <van-tab wx:for="{{tabs}}" wx:for-item="itm" wx:key="id" id="{{itm.id}}" title="{{itm.name}}"/>
-  </van-tabs>  
-</view>
-
-<!-- 证书 -->
-<view class="cers">
-  <button wx:for="{{active == 0 ? ncers : icers}}" wx:for-item="itm" wx:for-index="idx" wx:key="id" class="cers-button {{itm.isCheck ? 'active' : ''}}" id="{{itm.id}}" bindtap="onButtonPressed">{{itm.name}}</button>
-</view>

GuangZuan/miniprogram/mHome/pages/cerserach/index.less

@@ -0,0 +1,81 @@
+.tab-view {
+  position: sticky;
+  top: 0;
+  z-index: 999;
+}
+
+.cers {
+  display: flex;
+  flex-wrap: wrap;
+  margin-top: 15px;
+  align-items: center;
+  width: 100%;
+
+  button {
+    width: 17%;
+    font-size: 13px;
+    margin-bottom: 10px;
+  }
+
+  /* 选中时添加这个 样式 */
+  .active {
+    background: #dae9fd;
+  }
+  
+   /* 三角形 */
+  .active::before {
+    content: '';
+    display: inline-block;
+    position: absolute;
+    right: 0;
+    bottom: 0;
+    width: 0;
+    height: 0;
+    border-bottom: 15px solid rebeccapurple;
+    border-left: 14px solid transparent; 
+  }
+}
+
+.container {
+  display: flex;
+  flex-direction: column;
+  justify-content: flex-start;
+  align-items: center;
+  align-content: center;
+  width: 100%;
+
+  .input-view {
+    margin: 20px 0px;
+    width: 100%;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    align-content: center;
+    margin-bottom: 10px;
+
+    .field-view {
+      width: 95%;
+    }
+  
+    .label {
+      width: 100%;
+      text-align: center;
+      font-size: 15px;
+      color: #333;
+      height: 35px;
+      margin-top: 10px;
+    }
+  }
+}
+
+.button-view {
+  display: flex;
+  justify-content: space-between;
+  margin: 10px 10px 10px 10px;
+
+  van-button {
+    width: 48%;
+    height: 40px;
+  }
+}
+

GuangZuan/miniprogram/mHome/pages/cerserach/index.ts

@@ -0,0 +1,236 @@
+import Toast from "../../../miniprogram_npm/@vant/weapp/toast/toast"
+import { gzCertAddressConfig, gzCertAddressParam } from "../../../services/api/orders/index"
+
+// mHome/pages/cerserach/index.ts
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    /// tabs
+    tabs: [{id: 0, name: '国内'}, {id: 1, name: '国际'}],
+    /// tab索引
+    active: 0,
+    /// 参数配置信息
+    configs: <GuangZuan.GzCertAddressConfig[]>[],
+    /// 显示的数据
+    datas: <GuangZuan.GzCertAddressConfig[]>[],
+    /// 选中的证书类型
+    config: <GuangZuan.GzCertAddressConfig>{},
+    /// 证书参数信息
+    params: <GuangZuan.GzCertAddressParam[]>[],
+    /// 证书号
+    certno: '',
+    /// 防伪码
+    securityCode: '',
+    /// 查询地址
+    paramAddress: ''
+  },
+
+  /**
+   * 证书查询
+   */
+  certSearch() {
+    /// 合规性校验
+    if (!this.check()) { return }
+
+    var param = ''
+    /// 参数拼接
+    var filters =  this.data.params.filter(itm => {
+      return itm.certtype == this.data.config.certtype
+    })
+    /// 地址拼接
+    filters.forEach(obj => {
+      if (obj.orderindex == 1) {
+        param = param.concat(obj.paramkey+'='+this.data.certno+(filters.length > 1 ? '&' : '')) 
+      } else {
+        param = param.concat(obj.paramkey+'='+this.data.securityCode) 
+      }
+    })
+    /// 最终的查询地址
+    this.setData({ paramAddress: this.data.config.queryaddress+(param != "" ? param : '') })
+  },
+
+  /**
+   * 清空
+   */
+  clear() {
+    /// 数据清空
+    this.setData({
+      certno: '',
+      securityCode: '',
+      paramAddress: ''
+    })
+  },
+
+  /**
+   * 获取证书地址参数查询
+   */
+  gzCertAddressConfig() {
+    /// loding.....
+    Toast.loading({message: '加载中...'})
+    /// 发送查询
+    gzCertAddressConfig({
+      success: (res) => {
+        if (res.code != 200) {
+          Toast.fail('参数加载失败，原因：'+res.msg)
+          return
+        }
+        /// 设置数据
+        this.setData({ 
+          /// 配置数据
+          configs: res.data,
+          /// 显示数据
+          datas: res.data.filter(itm => {
+            /// 默认选中第一个
+            if (itm.orderindex == 1) { itm.isCheck = true }
+            return itm.certregion == this.data.active+1
+          }),
+        })
+        /// 默认选中第一个
+        this.setData({ config: this.data.datas[0] })
+      },
+      fail: (emsg) => {
+        Toast.fail('参数加载失败，原因：'+emsg)
+      },
+      complete: () => {}
+    })
+  },
+
+  /**
+   * 钻石证书地址参数
+   */
+  gzCertAddressParam() {
+    /// 发送查询
+    gzCertAddressParam({
+      success: (res) => {
+        if (res.code != 200) {
+          Toast.fail('证书地址参数加载失败，原因：'+res.msg)
+          return
+        }
+        /// 设置数据
+        this.setData({ 
+          /// 配置数据
+          params: res.data,
+        })
+      },
+      fail: (emsg) => {
+        Toast.fail('证书地址参数加载失败，原因：'+emsg)
+      },
+      complete: () => {}
+    })
+  },
+
+  /**
+   * tab触发事件
+   */
+  onTabChange(e: any) {
+    /// 设置激活项
+    this.setData({ 
+      active: e.detail.index,
+      /// 显示数据
+      datas: this.data.configs.filter(itm => {
+        return itm.certregion == e.detail.index+1
+      })
+    })
+    /// 默认选中第一个
+    this.setData({ config: this.data.datas[0] })
+  },
+
+  /**
+   * 返回上层视图
+   */
+  backToParent() {
+    /// 返回上层视图
+    wx.navigateBack()
+  },
+
+  /// 形状按钮点击事件
+  onButtonPressed(e: any) {
+    const index = e.target.id
+    /// 设置数据
+    this.setData({
+      datas: this.data.datas.map(item => {
+        item.isCheck = item.orderindex == index
+        return item
+      }),
+    })
+    this.setData({ config: this.data.datas.filter(itm => { return itm.orderindex == index })[0] })
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad() {
+    /// 获取参数配置信息
+    this.gzCertAddressConfig()
+    /// 获取钻石证书地址参数
+    this.gzCertAddressParam()
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /// 合规性校验
+  check(): boolean {
+    /// 请输入证书号
+    if (this.data.certno.length == 0) {
+      Toast.fail('请输入证书号！')
+      return false
+    }
+
+    /// 请输入防伪码
+    if (this.data.securityCode.length == 0) {
+      Toast.fail('请输入防伪码！')
+      return false
+    }
+    return true
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  }
+})

GuangZuan/miniprogram/mHome/pages/cerserach/index.wxml

@@ -0,0 +1,44 @@
+<!-- 导航栏 -->
+<van-nav-bar custom-style="background-color: #E92020">
+  <van-icon slot="left" name="arrow-left" size="25px" color="white" bind:click="backToParent"/>
+  <text slot="title" style="color: white;">钻石证书查询</text>
+</van-nav-bar>
+
+<!-- tabs -->
+<view class="tab-view">
+  <van-tabs swipeable bind:change="onTabChange" color="#2270D9" title-active-color="#2270D9" title-inactive-color="#8F8AA6">
+    <van-tab wx:for="{{tabs}}" wx:for-item="itm" wx:key="id" id="{{itm.id}}" title="{{itm.name}}"/>
+  </van-tabs>  
+</view>
+
+<!-- 证书 -->
+<view class="cers">
+    <button wx:for="{{datas}}" wx:for-item="itm" wx:for-index="idx" wx:key="certtype" class="cers-button {{itm.isCheck ? 'active' : ''}}" id="{{itm.orderindex}}" bindtap="onButtonPressed">{{itm.certtype}}</button>
+  </view>
+
+<view class="container">
+  <!-- 输入区域 -->
+  <view class="input-view">
+    <!-- 英文名称 -->
+    <text class="label">{{config.orgenname}}</text>
+    <!-- 请输入证书号 -->
+    <view class="field-view"><van-field model:value="{{ certno }}" input-align="center" placeholder="请输入证书号"></van-field></view>
+    <!-- 中文名称 -->
+    <text class="label">{{config.orgcnname}}</text>
+    <!-- 请输入防伪码 -->
+    <view class="field-view"><van-field model:value="{{ securityCode }}" input-align="center" placeholder="请输入防伪码"></van-field></view>
+    <!-- 证书类型 -->
+    <text class="label">{{config.certtype}}证书数据来源于官网，所有权归NGDTC所有。</text>
+    <!-- 证书查询地址 -->
+    <text class="label" style="padding-bottom: 10px;" wx:if="{{paramAddress != ''}}" user-select="{{true}}">证书查询地址：{{paramAddress}}</text>
+  </view>
+</view>
+
+<!-- 查询按钮 -->
+<view class="button-view">
+      <van-button custom-class="search" bind:click="certSearch" block color="linear-gradient(to right, #4bb0ff, #6149f6)">查询</van-button>
+      <van-button custom-class="clear" bind:click="clear" block color="linear-gradient(to right, #4bb0ff, #6149f6)">清空</van-button>
+    </view>
+
+<!-- toast --> 
+<van-toast id="van-toast" />

GuangZuan/miniprogram/mHome/pages/goodsdetail/goodsdetail.less → GuangZuan/miniprogram/mHome/pages/goodsdetail/index.less

@@ -1,5 +1,3 @@
-/* mHome/pages/goodsdetail/goodsdetail.wxss */
-
 .container {
   display: flex;
   flex-direction: column;

GuangZuan/miniprogram/mHome/pages/goodsdetail/goodsdetail.ts → GuangZuan/miniprogram/mHome/pages/goodsdetail/index.ts

@@ -1,4 +1,4 @@
-// mHome/pages/goodsdetail/goodsdetail.ts
+// mHome/pages/goodsdetail/index.ts
 
 Page({
 

GuangZuan/miniprogram/mHome/pages/goodsdetail/goodsdetail.wxml → GuangZuan/miniprogram/mHome/pages/goodsdetail/index.wxml

@@ -1,5 +1,3 @@
-<!--mHome/pages/goodsdetail/goodsdetail.wxml-->
-
 <!-- 导航栏 -->
 <van-nav-bar custom-style="background-color: #E92020">
   <van-icon slot="left" name="arrow-left" size="25px" color="white" bind:click="backToParent"/>

GuangZuan/miniprogram/mHome/pages/inspection/detail/detail.less → GuangZuan/miniprogram/mHome/pages/inspection/detail/index.less

@@ -1,5 +1,3 @@
-/* mHome/pages/inspection/detail/detail.wxss */
-
 .top-view {
   position: sticky;
   top: 0px;

GuangZuan/miniprogram/mHome/pages/inspection/detail/detail.ts → GuangZuan/miniprogram/mHome/pages/inspection/detail/index.ts

@@ -1,4 +1,4 @@
-// mHome/pages/inspection/detail/detail.ts
+// mHome/pages/inspection/detail/index.ts
 Page({
 
   /**

GuangZuan/miniprogram/mHome/pages/inspection/detail/detail.wxml → GuangZuan/miniprogram/mHome/pages/inspection/detail/index.wxml

@@ -1,4 +1,3 @@
-<!--mHome/pages/inspection/detail/detail.wxml-->
 <!-- top-view -->
 <view class="top-view">
   <!-- 导航栏 -->

GuangZuan/miniprogram/mHome/pages/inspection/list/list.less → GuangZuan/miniprogram/mHome/pages/inspection/list/index.less

@@ -1,5 +1,3 @@
-/* mHome/pages/inspection/list/list.wxss */
-
 .top-view {
   position: sticky;
   top: 0px;

GuangZuan/miniprogram/mHome/pages/inspection/list/list.ts → GuangZuan/miniprogram/mHome/pages/inspection/list/index.ts

@@ -3,7 +3,7 @@ import { queryGZCJJCOrder } from "../../../../services/api/trade/index"
 import { userid, getExecutestatus } from "../../../../services/utils"
 import { isnullstr } from "../../../../utils/util"
 
-// mHome/pages/inspection/list/list.ts
+// mHome/pages/inspection/list/index.ts
 Page({
 
   /**

GuangZuan/miniprogram/mHome/pages/inspection/list/list.wxml → GuangZuan/miniprogram/mHome/pages/inspection/list/index.wxml

@@ -1,4 +1,3 @@
-<!--mHome/pages/inspection/list/list.wxml-->
 <!-- top-view -->
 <view class="top-view">
   <!-- 导航栏 -->
@@ -9,7 +8,7 @@
 
   <!-- tabs -->
   <view class="tab-view">
-    <van-tabs sticky animated bind:change="onTabChange">
+    <van-tabs sticky animated bind:change="onTabChange" color="#2270D9" title-active-color="#2270D9" title-inactive-color="#8F8AA6">
       <van-tab wx:for="{{tabs}}" wx:for-item="itm" wx:key="id" id="{{itm.id}}" title="{{itm.name}}"/>
     </van-tabs>  
   </view>

GuangZuan/miniprogram/mHome/pages/jewelry/jewelry.less → GuangZuan/miniprogram/mHome/pages/jewelry/index.less

@@ -1,5 +1,3 @@
-/* mHome/pages/jewelry/jewelry.wxss */
-
 Page {
   background-color: #f6f6f6;
 }

GuangZuan/miniprogram/mHome/pages/jewelry/jewelry.ts → GuangZuan/miniprogram/mHome/pages/jewelry/index.ts

@@ -1,7 +1,7 @@
 import Toast from "../../../miniprogram_npm/@vant/weapp/toast/toast";
 import { querySellOrder } from "../../../services/api/orders/index";
 
-// mHome/pages/jewelry/jewelry.ts
+// mHome/pages/jewelry/index.ts
 Page({
 
   /**

GuangZuan/miniprogram/mHome/pages/jewelry/jewelry.wxml → GuangZuan/miniprogram/mHome/pages/jewelry/index.wxml

@@ -1,6 +1,4 @@
-<!--mHome/pages/jewelry/jewelry.wxml-->
- 
-<!-- top-view -->
+ <!-- top-view -->
 <view class="top-view">
   <!-- 导航栏 -->
   <van-nav-bar custom-style="background-color: #E92020">