店铺详情优化

src/pagesC/settledMerchant/addShop.vue

@@ -84,7 +84,7 @@
                 <uni-data-select v-model="formData.billing_type" :localdata="TypeDesc.billing_type" placeholder="请选择开票类型"></uni-data-select>
             </uni-forms-item> -->
             <uni-forms-item label="开户银行" required name="account_name">
-                <uni-easyinput v-model="formData.account_name" type="text" placeholder="请输入开户银行名称" />
+                <uni-easyinput v-model="formData.account_name" type="text" placeholder="请输入开户银行全称" />
             </uni-forms-item>
             <uni-forms-item label="银行卡号" required name="card_no">
                 <uni-easyinput v-model="formData.card_no" type="text" placeholder="请输入银行卡号" />
@@ -108,12 +108,12 @@
             <uni-forms-item label="入驻协议" required name="settled">
                 <upimg v-model="formData.settled" :count="9"/>
             </uni-forms-item>
-            <uni-forms-item label="平台截图" name="other_type">
+            <!-- <uni-forms-item label="平台截图" name="other_type">
                 <uni-data-select v-model="formData.other_type" :localdata="TypeDesc.other_type" placeholder="请选择平台"></uni-data-select>
             </uni-forms-item>
             <uni-forms-item label="上传截图">
                 <upimg v-model="formData.other_images"/>
-            </uni-forms-item>
+            </uni-forms-item> -->
         </uni-forms>
         <div class="btn" @click="submit">确认提交</div>
         <!-- <button class="button" @click="submit">校验表单</button> -->
@@ -157,7 +157,7 @@ export default {
                 // billing_type: { rules: [{ required: true, errorMessage: '请选择开票类型' }] },
                 bank: { rules: [{ required: true, errorMessage: '请输入开户行' }] },
                 card_no: { rules: [{ required: true, errorMessage: '请输入银行卡号' }] },
-                account_name: { rules: [{ required: true, errorMessage: '请输入开户银行名称' }] },
+                account_name: { rules: [{ required: true, errorMessage: '请输入开户银行全称' }] },
                 account_holder: { rules: [{ required: true, errorMessage: '请输入开户姓名/公户输入公司名称' }] },
                 card_id: { rules: [{ required: true, errorMessage: '请输入身份证号/公户输入法人身份证号' }] },
                 open_phone: { rules: [{ required: true, errorMessage: '请输入开户手机' }] },

src/pagesC/settledMerchant/merchantDetail.vue

@@ -28,9 +28,13 @@
         <div class="card detail">
             <div class="tit">收款信息</div>
             <view class="label">
-                <view class="title">开户名称：</view>
+                <view class="title">开户银行：</view>
                 <view class="nums">{{ detail.account_name }}</view>
             </view>
+            <view class="label">
+                <view class="title">开户名称：</view>
+                <view class="nums">{{ detail.account_holder }}</view>
+            </view>
             <view class="label">
                 <view class="title">身份证号：</view>
                 <view class="nums">{{ detail.card_id }}</view>

src/pagesC/settledMerchant/shopOrderLog.vue

@@ -8,7 +8,6 @@
           mode="widthFix"
         />
       </view>
-      <!-- <view class="count">数智钱包</view> -->
       <view class="capsule"></view>
     </view>
     <div class="h_top">
@@ -27,22 +26,6 @@
         </div>
       </div>
     </div>
-    <!-- <div class="btn_bar flex_r flex_jb">
-      <div
-        class="btn_item"
-        @click="getToCash"
-      >
-        <span class="ico iconfont">&#xe603;</span>
-        <span class="btn_txt">去提现</span>
-      </div>
-      <div
-        class="btn_item conv"
-        @click="goto('/pagesC/convert/index')"
-      >
-        <image class="ico" src="@/static/icon/convert.png" mode="widthFix" />
-        <span class="btn_txt">去转化</span>
-      </div>
-    </div> -->
 
     <!-- 资金列表 -->
     <div class="detailList">
@@ -66,27 +49,14 @@
             <span class="s2">{{i.num}}</span>
           </span>
         </p>
-        <image class="settle" src="@/static/icon/settle.png" v-if="i.status == 0" />
+        <image class="settle" src="https://cha-img.oss-cn-beijing.aliyuncs.com/images/settle.png" v-if="i.status == 0 || i.status == 2" />
+        <image class="settle" src="https://cha-img.oss-cn-beijing.aliyuncs.com/images/wait.png" v-if="i.status == 1 || i.status == 4" />
         <p class="flex_r flex_jb">
           <span class="s3">{{ i.update_time }}</span>
           <span class="s3">{{ i.type_id == 4 ? '智慧结算' : i.type_id == 1 ? '自助结算' : '其它' }}</span>
         </p>
       </div>
     </div>
-    <!-- <view class="con">
-      <view class="list" v-for="(item, index) in list" :key="index">
-        <view class="list_head flex_r flex_ac flex_jb">
-          <view class="head_name">{{ item.remark }}</view>
-          <view :class="['head_price',item.act == '+' ? 'g_color' : '']">{{ item.act }}{{item.num }}</view>
-        </view>
-        <view class="list_con flex_r flex_ac flex_jb">
-          <view class="list_time">{{ item.create_time }}</view>
-          <view class="list_balance">余额{{ item.after }}</view>
-        </view>
-      </view>
-      <not-goods v-if="haveGoods" textStr="暂无流水信息"></not-goods>
-    </view> -->
-    <!-- 资金列表 -->
   </view>
 </template>
 <script>