x x x x x x x

GuangZuan/miniprogram/config/index.ts

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

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

@@ -84,8 +84,6 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad(options: any) {
-    console.log(options);
-    
     // /// 传参信息
     // const item = JSON.parse(options.item)
     // /// 单据信息

GuangZuan/miniprogram/mHome/pages/bond/prepayment/index.ts

@@ -116,7 +116,6 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad(options: any) {
-    console.log(options)
     /// 数据解析
     if (options.orderid) {
       this.setData({ 

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

@@ -23,7 +23,7 @@ Page({
     /// 卖单信息
     order: <GuangZuan.SellOrder>({}),
     /// 颜色
-    colors: ['rebeccapurple', 'green', 'hotpink', 'orange', 'darkgoldenrod'],
+    colors: ['rebeccapurple', 'green', 'hotpink', 'orange', 'darkgoldenrod', 'firebrick'],
     /// 操作
     operator: 1,
     /// 委托时间
@@ -66,9 +66,6 @@ Page({
     /// showLoading
     showLoading(() => {
       queryPermancePlanTmp({
-        data: {
-          marketid: marketid()
-        },
         success: (res) => {
           /// 获取数据
           this.setData({ 

GuangZuan/miniprogram/mHome/pages/presell/detail/index.ts

@@ -20,7 +20,7 @@ Page({
     /// 选中履约模板
     tmp: <GuangZuan.PermancePlanTmp>({}),
     /// 颜色
-    colors: ['rebeccapurple', 'green', 'hotpink', 'orange', 'darkgoldenrod'],
+    colors: ['rebeccapurple', 'green', 'hotpink', 'orange', 'darkgoldenrod', 'firebrick'],
     /// banner图
     banners: ['']
   },
@@ -86,9 +86,6 @@ Page({
     /// showLoading
     showLoading(() => {
       queryPermancePlanTmp({
-        data: {
-          marketid: marketid()
-        },
         success: (res) => {
           /// 获取数据
           this.setData({ 

GuangZuan/miniprogram/mHome/pages/presell/list/index.ts

@@ -32,7 +32,7 @@ Page({
       /// 我参与的预售(预售中\执行中)\我参与的集采(集采中\执行中) 列表查询
       myTradingPreSells: <GuangZuan.GZMyTradingPreSell[]>[{}],
       /// 显示数据信息
-      values: [{}]
+      values: <{}>[]
   },
 
   /**

GuangZuan/miniprogram/mHome/pages/presell/list/index.wxml

@@ -1,6 +1,4 @@
-<!--mHome/pages/presell/list/index.wxml-->
 <view class="container"  style="padding-bottom: {{ safeBottom }}px;">
-
   <view class="tab-view" style="position: sticky; top: 0; z-index: 999;">
     <!-- 导航栏 -->
     <van-nav-bar custom-style="background-color: #407DB8">

GuangZuan/miniprogram/mHome/pages/presell/new/index.less

@@ -14,7 +14,7 @@
     justify-content: space-between;
     align-content: center;
     align-items: center;
-    
+
     .unit {
       font-size: 14px;
       color: #666;
@@ -28,7 +28,7 @@
     align-items: center;
     align-content: center;
     justify-content: center;
-    width: 100%;
+    width: 96%;
     padding-left: 10px;
 
     .content__item__step {
@@ -37,7 +37,6 @@
       justify-content: start;
       align-items: center;
       align-content: center;
-      width: 100%;
 
       &__item {
         display: flex;

GuangZuan/miniprogram/mHome/pages/presell/new/index.ts

@@ -24,9 +24,7 @@ Page({
     /// 是否显示日历
     showCal: false,
     /// 颜色
-    tcolors: ['rebeccapurple', 'green', 'hotpink', 'orange', 'darkgoldenrod'],
-    /// 最小日期
-    minDate: new Date(2010, 10, 1).getTime(),
+    tcolors: ['rebeccapurple', 'green', 'hotpink', 'orange', 'darkgoldenrod', 'firebrick', 'firebrick'],
     /// 是否开始日期
     isstart: true,
     /// 开始日期
@@ -37,6 +35,8 @@ Page({
     fileList: [],
     /// 上传的文件路径
     filePath: '',
+    /// 显示信息
+    actions: [''],
     /// 生产方式条件
     options: [{ text: 'HPHT', value: 1 }, { text: 'CVD', value: 2 }],
     /// 生产方式
@@ -195,49 +195,48 @@ Page({
 
   // input输入中
   getInputNum (e: any) {
-    console.log(e)
     let amount = e.detail
-      let num = null
-      // 小数点后最多只能输入两位
-      num = amount.replace(new RegExp('^(\\d+\\.\\d{2}).+'), '$1')
-      // 小数点开头得话，让前面加个0   eg: 0.xx
-      const startPoint = /^\./g
-      if (startPoint.test(num)) { num = amount.replace(startPoint, '0.') }
-
-      // 若没有小数点，前面输入多个0，去掉0取整
-      // if（num有值 && 没有小数点 && 不等于'0'）
-      if (num && !num.includes('.') && num !== '0') { num = +num }
-      // 若出现多个小数点，则替换为1个
-      const morePoint = /\.+(\d*|\.+)\./g
-      if (morePoint.test(num)) {
-        num = amount
-          .replace(/\.{2,}/g, ".")
-          .replace(".", "$#$")
-          .replace(/\./g, "")
-          .replace("$#$", ".")
-      }
-      switch (e.target.id) {
-        case 'maxbuyqty':   /// 最大采购单位
-          this.setData({ maxbuyqty: num})
-          break;
-        case 'pretotalqty':  /// 预售总量
-          this.setData({ pretotalqty: num})
-          break;
-        case 'preprice':       /// 预售价格
-          this.setData({ preprice: num})
-          break;
-        case 'buymarginvalue': /// 采购保证金 
-          this.setData({ buymarginvalue: num})
-          break;
-        case 'minbuyqty':      /// 最小采购单位
-          this.setData({ minbuyqty: num})
-          break;
-        case 'minsuccessqty':  /// 最低成团量
-          this.setData({ minsuccessqty: num})
-          break;
-        default:
-          break;
-      }
+    let num = null
+    // 小数点后最多只能输入两位
+    num = amount.replace(new RegExp('^(\\d+\\.\\d{2}).+'), '$1')
+    // 小数点开头得话，让前面加个0   eg: 0.xx
+    const startPoint = /^\./g
+    if (startPoint.test(num)) { num = amount.replace(startPoint, '0.') }
+
+    // 若没有小数点，前面输入多个0，去掉0取整
+    // if（num有值 && 没有小数点 && 不等于'0'）
+    if (num && !num.includes('.') && num !== '0') { num = +num }
+    // 若出现多个小数点，则替换为1个
+    const morePoint = /\.+(\d*|\.+)\./g
+    if (morePoint.test(num)) {
+      num = amount
+        .replace(/\.{2,}/g, ".")
+        .replace(".", "$#$")
+        .replace(/\./g, "")
+        .replace("$#$", ".")
+    }
+    switch (e.target.id) {
+      case 'maxbuyqty':   /// 最大采购单位
+        this.setData({ maxbuyqty: num})
+        break;
+      case 'pretotalqty':  /// 预售总量
+        this.setData({ pretotalqty: num})
+        break;
+      case 'preprice':       /// 预售价格
+        this.setData({ preprice: num})
+        break;
+      case 'buymarginvalue': /// 采购保证金 
+        this.setData({ buymarginvalue: num})
+        break;
+      case 'minbuyqty':      /// 最小采购单位
+        this.setData({ minbuyqty: num})
+        break;
+      case 'minsuccessqty':  /// 最低成团量
+        this.setData({ minsuccessqty: num})
+        break;
+      default:
+        break;
+    }
   },
 
   /// 照片上传
@@ -334,9 +333,6 @@ Page({
     /// showLoading
     showLoading(() => {
       queryPermancePlanTmp({
-        data: {
-          marketid: marketid()
-        },
         success: (res) => {
           /// 获取数据
           this.setData({ 

GuangZuan/miniprogram/mHome/pages/presell/new/index.wxml

@@ -11,61 +11,61 @@
   <van-cell-group>
     <van-cell><view solt="title" class="sub-title">预售信息</view></van-cell>
     <view class="cell-item">
-      <van-field id="wrstandname" label="商品名称：" title-width="8em" size="large" required clearable model:value="{{ wrstandname }}" placeholder="请输入商品名称" border="{{ false }}" />
+      <van-field id="wrstandname" label="商品名称：" title-width="8em" size="large" required clearable model:value="{{ wrstandname }}" placeholder="请输入商品名称"/>
     </view>
     <view class="cell-item">
-      <van-field id="pretotalqty" label="预售总量：" title-width="8em" type="digit" size="large" required clearable model:value="{{ pretotalqty }}" placeholder="请输入预售总量" border="{{ false }}" bind:input="getInputNum" />
+      <van-field id="pretotalqty" label="预售总量：" title-width="8em" type="digit" size="large" required clearable model:value="{{ pretotalqty }}" placeholder="请输入预售总量" bind:input="getInputNum" />
       <view class="unit">(克拉)</view>
     </view>
     <view class="cell-item">
-      <van-field id="preprice" label="预售价格：" title-width="8em" type="digit" size="large" required clearable model:value="{{ preprice }}" placeholder="请输入预售价格" border="{{ false }}" bind:input="getInputNum" />
+      <van-field id="preprice" label="预售价格：" title-width="8em" type="digit" size="large" required clearable model:value="{{ preprice }}" placeholder="请输入预售价格" bind:input="getInputNum" />
       <view class="unit">(元/克拉)</view>
     </view>
     <view class="cell-item">
-      <van-field id="minbuyqty" label="最小采购单位：" title-width="8em" type="digit" size="large" required clearable model:value="{{ minbuyqty }}" placeholder="请输入最小采购单位" border="{{ false }}" bind:input="getInputNum" />
+      <van-field id="minbuyqty" label="最小采购单位：" title-width="8em" type="digit" size="large" required clearable model:value="{{ minbuyqty }}" placeholder="请输入最小采购单位" bind:input="getInputNum" />
       <view class="unit">(克拉)</view>
     </view>
     <view class="cell-item">
-      <van-field id="maxbuyqty" label="最大采购单位：" title-width="8em" type="digit" size="large" required clearable model:value="{{ maxbuyqty }}" placeholder="请输入最大采购单位" border="{{ false }}" bind:input="getInputNum" />
+      <van-field id="maxbuyqty" label="最大采购单位：" title-width="8em" type="digit" size="large" required clearable model:value="{{ maxbuyqty }}" placeholder="请输入最大采购单位" bind:input="getInputNum" />
       <view class="unit">(克拉)</view>
     </view>
     <view class="cell-item">
-      <van-field id="minsuccessqty" label="最低成团量：" title-width="8em" type="digit" size="large" required clearable model:value="{{ minsuccessqty }}" placeholder="请输入最低成团量" border="{{ false }}" bind:input="getInputNum" />
+      <van-field id="minsuccessqty" label="最低成团量：" title-width="8em" type="digit" size="large" required clearable model:value="{{ minsuccessqty }}" placeholder="请输入最低成团量" bind:input="getInputNum" />
       <view class="unit">(克拉)</view>
     </view>
     <view class="cell-item">
-      <van-field id="buymarginvalue" label="采购保证金比例：" title-width="8em" type="digit" size="large" required clearable model:value="{{ buymarginvalue }}" placeholder="请输入采购保证金比例" border="{{ false }}" bind:input="getInputNum" />
+      <van-field id="buymarginvalue" label="采购保证金比例：" title-width="8em" type="digit" size="large" required clearable model:value="{{ buymarginvalue }}" placeholder="请输入采购保证金比例" bind:input="getInputNum" />
       <view class="unit">%</view>
     </view>
     <view class="cell-item">
-      <van-field id="startdate" title-width="8em" label="开始日期：" size="large" required readonly clearable value="{{ startdate }}" placeholder="请选择开始日期" border="{{ false }}" bind:click-input	="onButtonClick" />
+      <van-field id="startdate" title-width="8em" label="开始日期：" size="large" required readonly clearable value="{{ startdate }}" placeholder="请选择开始日期" bind:click-input	="onButtonClick" />
     </view>
     <view class="cell-item">
-      <van-field id="enddate" title-width="8em" label="结束日期：" size="large" required readonly clearable value="{{ enddate }}" placeholder="请选择结束日期" border="{{ false }}" bind:click-input	="onButtonClick" />
+      <van-field id="enddate" title-width="8em" label="结束日期：" size="large" required readonly clearable value="{{ enddate }}" placeholder="请选择结束日期" bind:click-input	="onButtonClick" />
     </view>
     <view class="cell-item">
-      <van-field title-width="8em" label="履约方式：" size="large" required readonly clearable value="{{ tmp.templatename }}" border="{{ false }}" bind:click-input="showPlanTmps" />
+      <van-field value="" title-width="8em" label="履约方式：" size="large" required readonly clearable value="{{ tmp.templatename }}" bind:click-input="showPlanTmps" />
       <view class="unit"><van-icon name="arrow"></van-icon></view>
     </view>
-    <view class="content prestyle">
+    <scroll-view class="content prestyle" scroll-x>
       <view class="content__item__step">
         <view class="content__item__step__item" wx:for="{{ tmp.LstStep }}" wx:for-item="itm" wx:for-index="idx" wx:key="idx"> 
           <text style="background-color: {{ tcolors[idx] }}; color: white;">{{ itm.stepinfo }}</text>
           <text>{{ itm.stepdate }}</text>
         </view>
       </view>
-    </view>
+    </scroll-view>
   </van-cell-group>
 
   <van-cell-group>
     <van-cell><view solt="title" class="sub-title">钻石参考信息</view></van-cell>
-    <van-field id="zscolor" label="颜色：" size="large" clearable model:value="{{ zscolor }}" placeholder="请输入颜色" border="{{ false }}" />
-    <van-field id="zsclarity" label="净度：" size="large" clearable model:value="{{ zsclarity }}" placeholder="请输入净度" border="{{ false }}" />
-    <van-field id="zssize" label="尺寸：" size="large" clearable model:value="{{ zssize }}" placeholder="请输入尺寸" border="{{ false }}" />
-    <van-field id="zsyield" label="成品率：" size="large" clearable model:value="{{ zsyield }}" placeholder="请输入成品率" border="{{ false }}" />
-    <van-field id="weightdesc" label="重量描述：" size="large" clearable model:value="{{ weightdesc }}" placeholder="请输入重量描述" border="{{ false }}" />
-    <van-field id="qtydesc" label="数量描述：" size="large" clearable model:value="{{ qtydesc }}" placeholder="请输入数量描述" border="{{ false }}" />
-    <van-field label="生产方式：" size="large" readonly border="{{ false }}">
+    <van-field id="zscolor" label="颜色：" size="large" clearable model:value="{{ zscolor }}" placeholder="请输入颜色" />
+    <van-field id="zsclarity" label="净度：" size="large" clearable model:value="{{ zsclarity }}" placeholder="请输入净度"/>
+    <van-field id="zssize" label="尺寸：" size="large" clearable model:value="{{ zssize }}" placeholder="请输入尺寸" />
+    <van-field id="zsyield" label="成品率：" size="large" clearable model:value="{{ zsyield }}" placeholder="请输入成品率" />
+    <van-field id="weightdesc" label="重量描述：" size="large" clearable model:value="{{ weightdesc }}" placeholder="请输入重量描述" />
+    <van-field id="qtydesc" label="数量描述：" size="large" clearable model:value="{{ qtydesc }}" placeholder="请输入数量描述" />
+    <van-field label="生产方式：" value="" size="large" readonly>
       <view slot="input">
         <van-radio-group solt="input" value="{{ way }}" bind:change="onChange" direction="horizontal" >
           <van-radio wx:for="{{ options }}" wx:for-item="itm" wx:key="value" name="{{ itm.value }}">{{ itm.text }}</van-radio>
@@ -81,7 +81,7 @@
         <view class="upload"><van-uploader max-count="6" deletable="{{ true }}" file-list="{{ fileList }}" bind:after-read="afterRead" bind:delete="deleteImage" /></view> 
       </view>
     </view>
-    <van-field id="remark" label="备注：" size="large" type="textarea" autosize maxlength="200" clearable model:value="{{ remark }}" placeholder="请输入备注信息" border="{{ false }}" bind:change="onChange" />
+    <van-field id="remark" label="备注：" size="large" type="textarea" autosize maxlength="200" clearable model:value="{{ remark }}" placeholder="请输入备注信息" />
   </van-cell-group>
 
   <!-- 操作按钮 -->
@@ -98,4 +98,4 @@
   <van-picker show-toolbar bind:confirm="onSelect" bind:cancel="onClose" columns="{{ actions }}" title="请选择履约模板" />
 </van-popup>
 <!-- 选择日期 -->  
-<van-calendar show="{{ showCal }}" min-date="{{ minDate }}" bind:close="onCloseCal" bind:confirm="onConfirm" />
+<van-calendar show="{{ showCal }}" bind:close="onCloseCal" bind:confirm="onConfirm" />

GuangZuan/miniprogram/mHome/pages/purchase/detail/index.ts

@@ -20,7 +20,7 @@ Page({
     /// 选中履约模板
     tmp: <GuangZuan.PermancePlanTmp>({}),
     /// 颜色
-    colors: ['rebeccapurple', 'green', 'hotpink', 'orange', 'darkgoldenrod'],
+    colors: ['rebeccapurple', 'green', 'hotpink', 'orange', 'darkgoldenrod', 'firebrick'],
     /// banner图
     banners: [''],
     /// 预售认购列表查询
@@ -108,9 +108,6 @@ Page({
     /// showLoading
     showLoading(() => {
       queryPermancePlanTmp({
-        data: {
-          marketid: marketid()
-        },
         success: (res) => {
           /// 获取数据
           this.setData({ 

GuangZuan/miniprogram/mHome/pages/purchase/list/index.ts

@@ -32,7 +32,7 @@ Page({
       /// 我参与的预售(预售中\执行中)\我参与的集采(集采中\执行中) 列表查询
       myTradingPreSells: <GuangZuan.GZMyTradingPreSell[]>[{}],
       /// 显示数据信息
-      values: [{}]
+      values: <{}>[]
   },
 
   /**

GuangZuan/miniprogram/mHome/pages/purchase/new/index.less

@@ -37,7 +37,7 @@
       font-size: 13px;
       text-align: center;
       padding: 7.5px 0px;
-      border-right: 1px solid #aaa;
+      border-right: 0.5px solid #aaa;
     }
   }
 

GuangZuan/miniprogram/mHome/pages/purchase/new/index.ts

@@ -24,9 +24,7 @@ Page({
     /// 是否显示日历
     showCal: false,
     /// 颜色
-    tcolors: ['rebeccapurple', 'green', 'hotpink', 'orange', 'darkgoldenrod'],
-    /// 最小日期
-    minDate: new Date(2010, 10, 1).getTime(),
+    tcolors: ['rebeccapurple', 'green', 'hotpink', 'orange', 'darkgoldenrod', 'firebrick'],
     /// 是否开始日期
     isstart: true,
     /// 开始日期
@@ -72,6 +70,8 @@ Page({
     category: 2,
     /// 列头
     columns: ['序号', '数量 >=', '价格/(元/克拉)', '操作'],
+    /// 显示信息
+    actions: [''],
     /// 数据信息
     datas: [{ price: 0.0, qty: 0.0, step: 1 }]
   },
@@ -218,45 +218,45 @@ Page({
   // input输入中
   getInputNum (e: any) {
     let amount = e.detail
-      let num = null
-      // 小数点后最多只能输入两位
-      num = amount.replace(new RegExp('^(\\d+\\.\\d{2}).+'), '$1')
-
-      // 小数点开头得话，让前面加个0   eg: 0.xx
-      const startPoint = /^\./g
-      if (startPoint.test(num)) { num = amount.replace(startPoint, '0.') }
-
-      // 若没有小数点，前面输入多个0，去掉0取整
-      // if（num有值 && 没有小数点 && 不等于'0'）
-      if (num && !num.includes('.') && num !== '0') { num = +num }
-      // 若出现多个小数点，则替换为1个
-      const morePoint = /\.+(\d*|\.+)\./g
-      if (morePoint.test(num)) {
-        num = amount
-          .replace(/\.{2,}/g, ".")
-          .replace(".", "$#$")
-          .replace(/\./g, "")
-          .replace("$#$", ".")
-      }
-      switch (e.target.id) {
-        case 'maxbuyqty':   /// 最大采购单位
-          this.setData({ maxbuyqty: num})
-          break;
-        case 'pretotalqty':  /// 预售总量
-          this.setData({ pretotalqty: num})
-          break;
-        case 'buymarginvalue': /// 采购保证金 
-          this.setData({ buymarginvalue: num})
-          break;
-        case 'minbuyqty':      /// 最小采购单位
-          this.setData({ minbuyqty: num})
-          break;
-        case 'minsuccessqty':  /// 最低成团量
-          this.setData({ minsuccessqty: num})
-          break;
-        default:
-          break;
-      }
+    let num = null
+    // 小数点后最多只能输入两位
+    num = amount.replace(new RegExp('^(\\d+\\.\\d{2}).+'), '$1')
+
+    // 小数点开头得话，让前面加个0   eg: 0.xx
+    const startPoint = /^\./g
+    if (startPoint.test(num)) { num = amount.replace(startPoint, '0.') }
+
+    // 若没有小数点，前面输入多个0，去掉0取整
+    // if（num有值 && 没有小数点 && 不等于'0'）
+    if (num && !num.includes('.') && num !== '0') { num = +num }
+    // 若出现多个小数点，则替换为1个
+    const morePoint = /\.+(\d*|\.+)\./g
+    if (morePoint.test(num)) {
+      num = amount
+        .replace(/\.{2,}/g, ".")
+        .replace(".", "$#$")
+        .replace(/\./g, "")
+        .replace("$#$", ".")
+    }
+    switch (e.target.id) {
+      case 'maxbuyqty':   /// 最大采购单位
+        this.setData({ maxbuyqty: num})
+        break;
+      case 'pretotalqty':  /// 预售总量
+        this.setData({ pretotalqty: num})
+        break;
+      case 'buymarginvalue': /// 采购保证金 
+        this.setData({ buymarginvalue: num})
+        break;
+      case 'minbuyqty':      /// 最小采购单位
+        this.setData({ minbuyqty: num})
+        break;
+      case 'minsuccessqty':  /// 最低成团量
+        this.setData({ minsuccessqty: num})
+        break;
+      default:
+        break;
+    }
   },
 
   /// 申请提交
@@ -341,9 +341,9 @@ Page({
     /// showLoading
     showLoading(() => {
       queryPermancePlanTmp({
-        data: {
-          marketid: marketid()
-        },
+        // data: {
+        //   marketid: marketid()
+        // },
         success: (res) => {
           /// 获取数据
           this.setData({ 
@@ -364,7 +364,6 @@ Page({
    * 新增价格
    */
   addPrice(e: any) {
-    console.log(e)
     this.setData({
       datas: this.data.datas.concat([{price: 0.0, qty: 0.0, step: this.data.datas.length+1}]) 
     })
@@ -389,18 +388,36 @@ Page({
    * 数据变化
    */
   onRowChanged(e: any) {
-    console.log(e)
     /// 获取对应的id
     const ids = (<string> e.target.id).split(' ')
     const row = <number><unknown>ids[0]
     const id = ids[1]
     var obj = this.data.datas[row-1]
-    /// 数据赋值
-    if (id === "qty") {
-      obj.qty = e.detail
-    } else {
-      obj.price = e.detail
+
+    let amount = e.detail
+    let num = null
+    // 小数点后最多只能输入两位
+    num = amount.replace(new RegExp('^(\\d+\\.\\d{2}).+'), '$1')
+
+    // 小数点开头得话，让前面加个0   eg: 0.xx
+    const startPoint = /^\./g
+    if (startPoint.test(num)) { num = amount.replace(startPoint, '0.') }
+
+    // 若没有小数点，前面输入多个0，去掉0取整
+    // if（num有值 && 没有小数点 && 不等于'0'）
+    if (num && !num.includes('.') && num !== '0') { num = +num }
+    // 若出现多个小数点，则替换为1个
+    const morePoint = /\.+(\d*|\.+)\./g
+
+    if (morePoint.test(num)) {
+      num = amount
+        .replace(/\.{2,}/g, ".")
+        .replace(".", "$#$")
+        .replace(/\./g, "")
+        .replace("$#$", ".")
     }
+    /// 数据赋值
+    if (id === "qty") { obj.qty = num } else { obj.price = num }
     /// 删除数据
     this.data.datas.splice(row-1, 1)
     this.data.datas.splice(row-1, 0, obj)

GuangZuan/miniprogram/mHome/pages/purchase/new/index.wxml

@@ -11,10 +11,10 @@
   <van-cell-group>
     <van-cell><view solt="title" class="sub-title">集采信息</view></van-cell>
     <view class="cell-item">
-      <van-field id="wrstandname" label="商品名称：" title-width="8em" size="large" required clearable model:value="{{ wrstandname }}" placeholder="请输入商品名称" border="{{ false }}"/>
+      <van-field id="wrstandname" label="商品名称：" title-width="8em" size="large" required clearable model:value="{{ wrstandname }}" placeholder="请输入商品名称"/>
     </view>
     <view class="cell-item">
-      <van-field label="钻石类型：" title-width="8em" size="large" required readonly border="{{ false }}">
+      <van-field label="钻石类型：" title-width="8em" size="large" required readonly>
         <view slot="input">
           <van-radio-group solt="input" value="{{ category }}" bind:change="onChange" direction="horizontal" >
             <van-radio wx:for="{{ categorys }}" wx:for-item="itm" wx:key="value" name="{{ itm.value }}">{{ itm.text }}</van-radio>
@@ -23,33 +23,33 @@
       </van-field>
     </view>
     <view class="cell-item">
-      <van-field id="pretotalqty" label="预售总量：" type="digit" title-width="8em" size="large" required clearable model:value="{{ pretotalqty }}" placeholder="请输入预售总量" border="{{ false }}" bind:input="getInputNum" />
+      <van-field id="pretotalqty" label="预售总量：" type="digit" title-width="8em" size="large" required clearable model:value="{{ pretotalqty }}" placeholder="请输入预售总量" bind:input="getInputNum" />
       <view class="unit">(克拉)</view>
     </view>
     <view class="cell-item">
-      <van-field id="minbuyqty" label="最小采购单位：" type="digit" title-width="8em" size="large" required clearable model:value="{{ minbuyqty }}" placeholder="请输入最小采购单位" border="{{ false }}" bind:input="getInputNum" />
+      <van-field id="minbuyqty" label="最小采购单位：" type="digit" title-width="8em" size="large" required clearable model:value="{{ minbuyqty }}" placeholder="请输入最小采购单位" bind:input="getInputNum" />
       <view class="unit">(克拉)</view>
     </view>
     <view class="cell-item">
-      <van-field id="maxbuyqty" label="最大采购单位：" type="digit" title-width="8em" size="large" required clearable model:value="{{ maxbuyqty }}" placeholder="请输入最大采购单位" border="{{ false }}" bind:input="getInputNum" />
+      <van-field id="maxbuyqty" label="最大采购单位：" type="digit" title-width="8em" size="large" required clearable model:value="{{ maxbuyqty }}" placeholder="请输入最大采购单位" bind:input="getInputNum" />
       <view class="unit">(克拉)</view>
     </view>
     <view class="cell-item">
-      <van-field id="minsuccessqty" label="最低成团量：" type="digit" title-width="8em" size="large" required clearable model:value="{{ minsuccessqty }}" placeholder="请输入最低成团量" border="{{ false }}" bind:input="getInputNum" />
+      <van-field id="minsuccessqty" label="最低成团量：" type="digit" title-width="8em" size="large" required clearable model:value="{{ minsuccessqty }}" placeholder="请输入最低成团量" bind:input="getInputNum" />
       <view class="unit">(克拉)</view>
     </view>
     <view class="cell-item">
-      <van-field id="buymarginvalue" label="采购保证金比例：" type="digit" title-width="8em" size="large" required clearable model:value="{{ buymarginvalue }}" placeholder="请输入采购保证金比例" border="{{ false }}" bind:input="getInputNum"	/>
+      <van-field id="buymarginvalue" label="采购保证金比例：" type="digit" title-width="8em" size="large" required clearable model:value="{{ buymarginvalue }}" placeholder="请输入采购保证金比例" bind:input="getInputNum"	/>
       <view class="unit">%</view>
     </view>
     <view class="cell-item">
-      <van-field id="startdate" label="开始日期：" title-width="8em" size="large" required readonly clearable value="{{ startdate }}" placeholder="请选择开始日期" border="{{ false }}" bind:click-input	="onButtonClick" />
+      <van-field id="startdate" label="开始日期：" title-width="8em" size="large" required readonly clearable value="{{ startdate }}" placeholder="请选择开始日期" bind:click-input	="onButtonClick" />
     </view>
     <view class="cell-item">
-      <van-field id="enddate" label="结束日期：" title-width="8em" size="large" required readonly clearable value="{{ enddate }}" placeholder="请选择结束日期" border="{{ false }}" bind:click-input	="onButtonClick" />
+      <van-field id="enddate" label="结束日期：" title-width="8em" size="large" required readonly clearable value="{{ enddate }}" placeholder="请选择结束日期" bind:click-input	="onButtonClick" />
     </view>
     <view class="cell-item">
-      <van-field label="履约方式：" title-width="8em" size="large" required readonly clearable value="{{ tmp.templatename }}" border="{{ false }}" bind:click-input="showPlanTmps" />
+      <van-field label="履约方式：" title-width="8em" size="large" required readonly clearable value="{{ tmp.templatename }}" bind:click-input="showPlanTmps" />
       <view class="unit"><van-icon name="arrow"></van-icon></view>
     </view>
     <view class="content prestyle">
@@ -73,10 +73,10 @@
     <view class="row" wx:for="{{ datas }}" wx:for-item="itm" wx:for-index="idx" wx:key="idx">
       <view class="row__item">{{ itm.step }}</view> 
       <view class="row__item">
-        <van-field id="{{ itm.step }} qty" value="{{ itm.qty }}" input-align="center" clearable type="digit" readonly="{{ idx === 0 }}" bind:change="onRowChanged" ></van-field>
+        <van-field id="{{ itm.step }} qty" value="{{ itm.qty }}" input-align="center" clearable type="digit" readonly="{{ idx === 0 }}" bind:input="onRowChanged" ></van-field>
       </view> 
       <view class="row__item">
-        <van-field id="{{ itm.step }} price" value="{{ itm.price }}" input-align="center" clearable type="digit" bind:change="onRowChanged"	></van-field>
+        <van-field id="{{ itm.step }} price" value="{{ itm.price }}" input-align="center" clearable type="digit" bind:input="onRowChanged"	></van-field>
       </view> 
       <view class="row__item"><van-icon name="delete-o" size="15px" bind:click="deleteRow" id="{{ itm.step }}"></van-icon></view>
     </view>
@@ -84,14 +84,14 @@
 
   <van-cell-group>
     <van-cell><view solt="title" class="sub-title">钻石参考信息</view></van-cell>
-    <van-field id="zsshape" label="形状：" size="large" clearable model:value="{{ zsshape }}" placeholder="请输入形状" border="{{ false }}" />
-    <van-field id="zscolor" label="颜色：" size="large" clearable model:value="{{ zscolor }}" placeholder="请输入颜色" border="{{ false }}" />
-    <van-field id="zsclarity" label="净度：" size="large" clearable model:value="{{ zsclarity }}" placeholder="请输入净度" border="{{ false }}" />
-    <van-field id="zssize" label="尺寸：" size="large" clearable model:value="{{ zssize }}" placeholder="请输入尺寸" border="{{ false }}" />
-    <van-field id="zspolish" label="抛光：" size="large" clearable model:value="{{ zspolish }}" placeholder="请输入抛光" border="{{ false }}" />
-    <van-field id="zssymmetry" label="对称：" size="large" clearable model:value="{{ zssymmetry }}" placeholder="请输入对称" border="{{ false }}" />
-    <van-field id="zscut" label="切工：" size="large" clearable model:value="{{ zscut }}" placeholder="请输入切工" border="{{ false }}" bind:change="onChange" />
-    <van-field id="zsfluorescence" label="荧光：" size="large" clearable model:value="{{ zsfluorescence }}" placeholder="请输入荧光" border="{{ false }}" />
+    <van-field id="zsshape" label="形状：" size="large" clearable model:value="{{ zsshape }}" placeholder="请输入形状" />
+    <van-field id="zscolor" label="颜色：" size="large" clearable model:value="{{ zscolor }}" placeholder="请输入颜色" />
+    <van-field id="zsclarity" label="净度：" size="large" clearable model:value="{{ zsclarity }}" placeholder="请输入净度" />
+    <van-field id="zssize" label="尺寸：" size="large" clearable model:value="{{ zssize }}" placeholder="请输入尺寸" />
+    <van-field id="zspolish" label="抛光：" size="large" clearable model:value="{{ zspolish }}" placeholder="请输入抛光"/>
+    <van-field id="zssymmetry" label="对称：" size="large" clearable model:value="{{ zssymmetry }}" placeholder="请输入对称" />
+    <van-field id="zscut" label="切工：" size="large" clearable model:value="{{ zscut }}" placeholder="请输入切工" />
+    <van-field id="zsfluorescence" label="荧光：" size="large" clearable model:value="{{ zsfluorescence }}" placeholder="请输入荧光" />
     <!-- 凭证 -->
     <view class="credentials-info" style="padding-top: 10px;">
       <text style="padding-left: 15px; font-size: 15px; width: 130px;">*附件</text>
@@ -101,7 +101,7 @@
         <view class="upload"><van-uploader max-count="6" deletable="{{ true }}" file-list="{{ fileList }}" bind:after-read="afterRead" bind:delete="deleteImage" /></view> 
       </view>
     </view>
-    <van-field id="remark" label="备注：" size="large" type="textarea" autosize maxlength="200" clearable model:value="{{ remark }}" placeholder="请输入备注信息" border="{{ false }}" />
+    <van-field id="remark" label="备注：" size="large" type="textarea" autosize maxlength="200" clearable model:value="{{ remark }}" placeholder="请输入备注信息"/>
   </van-cell-group>
 
   <!-- 操作按钮 -->
@@ -118,4 +118,4 @@
   <van-picker show-toolbar bind:confirm="onSelect" bind:cancel="onClose" columns="{{ actions }}" title="请选择履约模板" />
 </van-popup>
 <!-- 选择日期 -->  
-<van-calendar show="{{ showCal }}" min-date="{{ minDate }}" bind:close="onCloseCal" bind:confirm="onConfirm" />
+<van-calendar show="{{ showCal }}" bind:close="onCloseCal" bind:confirm="onConfirm" />

GuangZuan/miniprogram/mHome/pages/settle/list/index.ts

@@ -20,7 +20,7 @@ Page({
       /// 是否空数据
       isEmpty: false,
       /// 显示数据信息
-      values: [{}]
+      values: <{}>[]
   },
 
    /**

GuangZuan/miniprogram/mMine/pages/inoutgold/index.wxml

@@ -21,7 +21,7 @@
     <!-- 充值金额 -->
     <view class="item amount">
       <text class="title">充值金额</text>
-      <van-field id="into-amount-field" model:value="{{ inamount }}" clearable type="digit" adjust-position border="{{ false }}" placeholder="请输入充值金额" />
+      <van-field id="into-amount-field" model:value="{{ inamount }}" clearable type="digit" adjust-position placeholder="请输入充值金额" />
     </view>
 
     <!-- 凭证 -->
@@ -41,7 +41,7 @@
     <view class="item out-amount" id="item-out-amount">
       <text class="title">提现金额</text>
       <view class="out-amount-view">
-        <van-field id="out-amount-field" model:value="{{ outamount }}" clearable type="digit" adjust-position border="{{ false }}" placeholder="请输入提现金额" />
+        <van-field id="out-amount-field" model:value="{{ outamount }}" clearable type="digit" adjust-position placeholder="请输入提现金额" />
         <view class="enable-out-amount-view">
           <text class="enable-out-amount">可提现金额：{{enableOutAmount}}</text>
           <van-button id="allamount" color="#F7A657" round type="mini" bind:click="onButtonPressed">全部</van-button>

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

@@ -10,6 +10,10 @@
     align-items: center;
     align-content: center;
 
+    van-tabs {
+      width: 100px;
+    }
+
     text {
       color: #666;
       font-size: 12px;

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

@@ -103,21 +103,22 @@ Page({
           hideLoading(()=>{}, '请求失败，原因：'+res.msg)
           return
         }
-        
-        /// 设置数据
-        this.setData({
-          /// 设置列头
-          datas: res.data,
-          isEmpty: res.data.length === 0,
-          /// 显示的值
-          values: res.data.map(obj => {
-            return {up: [obj.qty+'ct', 
-                        isnullstr(obj.zsshapetypedisplay), 
-                        '--', 
-                        isnullstr(obj.sizedisplay), 
-                        isnullstr(obj.goodsno)], 
-                    dwn: [isnullstr(obj.zsczcolor1typedisplay)+' | '+isnullstr(obj.zsclaritytype1display)+' | '+isnullstr(obj.zscuttype1display)+' | '+isnullstr(obj.zspolishtype1display)+' | '+isnullstr(obj.zssymmetrytype1display)+' | '+isnullstr(obj.zsfluorescencetype1display)+' | '+isnullstr(obj.zscerttypedisplay),
-                        obj.zscurrencytypedisplayunit+obj.price]}
+        hideLoading(()=>{ 
+          /// 设置数据
+          this.setData({
+            /// 设置列头
+            datas: res.data,
+            isEmpty: res.data.length === 0,
+            /// 显示的值
+            values: res.data.map(obj => {
+              return {up: [obj.qty+'ct', 
+                          isnullstr(obj.zsshapetypedisplay), 
+                          '--', 
+                          isnullstr(obj.sizedisplay), 
+                          isnullstr(obj.goodsno)], 
+                      dwn: [isnullstr(obj.zsczcolor1typedisplay)+' | '+isnullstr(obj.zsclaritytype1display)+' | '+isnullstr(obj.zscuttype1display)+' | '+isnullstr(obj.zspolishtype1display)+' | '+isnullstr(obj.zssymmetrytype1display)+' | '+isnullstr(obj.zsfluorescencetype1display)+' | '+isnullstr(obj.zscerttypedisplay),
+                          obj.zscurrencytypedisplayunit+obj.price]}
+            })
           })
         })
       },

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

@@ -7,7 +7,7 @@
 
   <!-- 过滤条件 -->
   <view class="result-view" style="background-color: white;">
-    <van-tabs custom-class="buyOrSell" type="card" sticky animated bind:change="onDTabChange" line-height="0px" color="#2270D9" title-inactive-color="#333" title-active-color="#407DB8">
+    <van-tabs custom-class="buyOrSell" type="card" sticky animated bind:change="onDTabChange" line-height="0px" color="#2270D9" title-inactive-color="#333" title-active-color="#fff">
       <van-tab wx:for="{{ ['买', '卖'] }}" wx:for-item="itm" wx:for-index="idx" wx:key="idx" active="{{ idx }}" title="{{ itm }}"/>
     </van-tabs>  
     <text>从</text>

GuangZuan/miniprogram/mTrade/pages/delistingsell/index.ts

@@ -38,7 +38,7 @@ Page({
     /// 单据显示
     orderValue: { up: [''], dwn: ['']},
     /// 颜色
-    colors: ['rebeccapurple', 'green', 'hotpink', 'orange', 'darkgoldenrod']
+    colors: ['rebeccapurple', 'green', 'hotpink', 'orange', 'darkgoldenrod', 'firebrick']
   },
 
   /**
@@ -70,9 +70,6 @@ Page({
     /// showLoading
     showLoading(() => {
       queryPermancePlanTmp({
-        data: {
-          marketid: marketid()
-        },
         success: (res) => {
           /// 获取数据
           this.setData({ 

GuangZuan/miniprogram/mTrade/pages/listingbuy/index.ts

@@ -15,7 +15,7 @@ Page({
     /// 底部安全区域
     safeBottom: getApp().globalData.safeBottom,
     /// 颜色
-    tcolors: ['rebeccapurple', 'green', 'hotpink', 'orange', 'darkgoldenrod'],
+    tcolors: ['rebeccapurple', 'green', 'hotpink', 'orange', 'darkgoldenrod', 'firebrick'],
     /// tabs
     tabs: [{ id: 2, name: '单颗裸钻' }, { id: 5, name: '单颗彩钻' }],
     /// tab索引
@@ -141,7 +141,7 @@ Page({
   },
 
   onRadioChange(e: any) {
-    console.log(e)
+    
   },
 
   /// 重量范围值更改
@@ -157,9 +157,6 @@ Page({
     /// showLoading
     showLoading(() => {
       queryPermancePlanTmp({
-        data: {
-          marketid: marketid()
-        },
         success: (res) => {
           /// 获取数据
           this.setData({ 

GuangZuan/miniprogram/mTrade/pages/listingsell/index.ts

@@ -41,7 +41,7 @@ Page({
     /// 显示信息
     actions: [''],
     /// 颜色
-    colors: ['rebeccapurple', 'green', 'hotpink', 'orange', 'darkgoldenrod']
+    colors: ['rebeccapurple', 'green', 'hotpink', 'orange', 'darkgoldenrod', 'firebrick']
   },
 
   /**
@@ -99,9 +99,6 @@ Page({
     /// showLoading
     showLoading(() => {
       queryPermancePlanTmp({
-        data: {
-          marketid: marketid()
-        },
         success: (res) => {
           /// 获取数据
           this.setData({ 

GuangZuan/miniprogram/mTrade/pages/orderdetail/index.ts

@@ -18,7 +18,7 @@ Page({
     /// 选中履约模板
     tmp: <GuangZuan.PermancePlanTmp>({}),
     /// 颜色
-    colors: ['rebeccapurple', 'green', 'hotpink', 'orange', 'darkgoldenrod'],
+    colors: ['rebeccapurple', 'green', 'hotpink', 'orange', 'darkgoldenrod', 'firebrick'],
     /// 资金账户ID
     accountid: accountid()
   },
@@ -45,9 +45,6 @@ Page({
     /// showLoading
     showLoading(() => {
       queryPermancePlanTmp({
-        data: {
-          marketid: marketid(),
-        },
         success: (res) => {
           /// 获取数据
           this.setData({ 

GuangZuan/miniprogram/pages/home/index.wxml

@@ -35,7 +35,7 @@
 
   <view style="background-color: #fff;">
     <!-- 功能菜单 -->
-    <van-grid column-num="5" border="{{ false }}" icon-size="{{ 35 }}">
+    <van-grid column-num="5" icon-size="{{ 35 }}">
       <van-grid-item content-class ="van-grid-item" wx:for="{{ menus }}" wx:key="id" wx:for-index="idx" wx:for-item="itm" id="{{ itm.id }}" url="{{ itm.path }}" text="{{ itm.title }}" icon="{{ imgUrl+itm.icon }}.png" link-type="{{ itm.id === 1 ? 'switchTab' : 'navigateTo' }}"/>
     </van-grid>
   </view>

GuangZuan/miniprogram/services/http/index.ts

@@ -69,7 +69,7 @@ export async function httpRequest<T extends { req?: unknown, rsp?: unknown }>(ur
     enableAuthorization: enableAuthorization ?? true,
     data,
   }
-
+    
   await httpMiddleware(config).then((res) => {
     const data = res as HttpResponse<T['rsp']>
     switch (data.code) {

GuangZuan/miniprogram/utils/util.ts

@@ -18,7 +18,7 @@ export const formatTime = (date: Date) => {
 /// 格式化日期
 export function formatDate(date: Date) {
   date = new Date(date);
-  return `${date.getFullYear()}/${date.getMonth() + 1}/${date.getDate()}`;
+  return `${date.getFullYear()}-${date.getMonth() + 1}-${date.getDate()}`;
 }
 
 /**
@@ -55,4 +55,31 @@ const formatNumber = (n: number) => {
 /// 判断字符串是否为空
 export const isnullstr = (str: string) => {
   return str == '' ? '--' : str
+}
+
+/// 截取两位小数位
+export const getDecimalNum = (number: string) => {
+  let amount = number
+  let num = null
+  // 小数点后最多只能输入两位
+  num = number.replace(new RegExp('^(\\d+\\.\\d{2}).+'), '$1')
+
+  // 小数点开头得话，让前面加个0   eg: 0.xx
+  const startPoint = /^\./g
+  if (startPoint.test(num)) { num = amount.replace(startPoint, '0.') }
+
+  // 若没有小数点，前面输入多个0，去掉0取整
+  // if（num有值 && 没有小数点 && 不等于'0'）
+  if (num && !num.includes('.') && num !== '0') { num = +num }
+  // 若出现多个小数点，则替换为1个
+  const morePoint = /\.+(\d*|\.+)\./g
+
+  if (morePoint.test(String(num))) {
+    num = amount
+      .replace(/\.{2,}/g, ".")
+      .replace(".", "$#$")
+      .replace(/\./g, "")
+      .replace("$#$", ".")
+  }
+  return num
 }