Merge branch 'dev' of http://124.70.149.18:10880/lianghj/queenshow into dev

src/modules/resource/index.ts

@@ -76,7 +76,7 @@ export class ResourceModule extends ModuleRoot {
 
     this.controls.sysImageListCtrl.setCrudPrefix("/sys/source");
     this.controls.sysImageListCtrl.state.size = 20;
-    this.controls.sysImageListCtrl.state.query = { fileType: "image" };
+    this.controls.sysImageListCtrl.state.query = { fileType: "image" , isSvg: {$ne: true}};
 
     this.controls.sysVideoListCtrl.setCrudPrefix("/sys/source");
     this.controls.sysVideoListCtrl.state.size = 20;

src/pages/website/Payment/index.tsx

@@ -369,9 +369,9 @@ export default defineComponent({
 
                   <div class="flex-1 ml-0.3rem">
                     <div class="text-0.16rem font-bold my-0.3rem">
-                      <span>实付款：</span>
+                      <span class="text-[#333]">实付款：</span>
                       <span class="text-0.3rem text-[#D34D39]">
-                        {state.amountPrice.toFixed(1)}
+                        {state.amountPrice}
                       </span>
                       <span class="text-[#D34D39]">元</span>
                     </div>
@@ -405,9 +405,19 @@ export default defineComponent({
                       </div>
                     )}
                     {state.payWayIdx === 1 && (
-                      <div class="text-0.2rem">
-                        请咨询：
-                        <tel class="text-[#DB8F32]">138 0804 4500</tel>
+                      <div class="text-0.16rem space-y-0.1rem">
+                        <div class="transfer-row">
+                          <span>户名</span>成都中鱼互动科技有限公司
+                        </div>
+                        <div class="transfer-row">
+                          <span>开户行</span>中国银行成都益州支行
+                        </div>
+                        <div class="transfer-row">
+                          <span>帐号</span>1185 5686 4401
+                        </div>
+                        <div class="transfer-row">
+                          <span>备注</span>注册手机号+购买版本+人数+时长
+                        </div>
                       </div>
                     )}
                   </div>
@@ -530,4 +540,11 @@ const rootCls = css`
   .inputNum {
     @apply w-1.8rem mx-0.16rem border-[#c9c9c9] text-[#111];
   }
+
+  .transfer-row{
+    span {
+      display: inline-block;
+      width: 0.6rem;
+    }
+  }
 `;