feat: grid sm,lg,xl size gap, file util download optimized

Author: modstart

module/AdminManager/Asset/entry/upgrade.js

@@ -344,6 +344,9 @@ export default {
             }
         },
         doMemberLoginSubmit() {
+            if (!this.memberLoginInfo.username || !this.memberLoginInfo.password || !this.memberLoginInfo.captcha) {
+                return
+            }
             if (!this.memberLoginInfo.agree) {
                 this.$dialog.tipError('请先同意使用协议')
                 return

module/AdminManager/resources/asset/src/pages/Upgrade.vue

@@ -1,4 +1,4 @@
-## 3.5.0
+## 3.5.0 新增：内容页面支持模板自定义功能
 
 - 新增：内容页面支持模板自定义功能
 

module/Cms/Docs/release.md

@@ -175,6 +175,18 @@ public static function get($vipId, $key = null)
         return null;
     }
 
+    public static function calcExpire($oldExpire, $newVipId)
+    {
+        $newVip = self::get($newVipId);
+        $newDays = ($newVip ? $newVip['vipDays'] : 0);
+        $oldExpireTimestamp = (strtotime($oldExpire) > 0 ? strtotime($oldExpire) : 0);
+        $timestamp = time();
+        if ($oldExpireTimestamp > time()) {
+            $timestamp = $oldExpireTimestamp;
+        }
+        return date('Y-m-d', $oldExpireTimestamp + $newDays * 24 * 3600);
+    }
+
     /**
      * 会员卡升级差价计算
      *

module/Member/Util/MemberVipUtil.php

@@ -196,7 +196,7 @@ class="vip-button">
                                 <div class="row">
                                     @foreach($memberVipRights as $r)
                                         <div class="col-md-2 col-6" style="display:none;" data-vip-right="{{join(',',$r['vipIds'])}}">
-                                            <div class="tw-flex tw-items-center ub-text-small">
+                                            <div class="tw-flex tw-items-center ub-text-sm">
                                                 <div class="tw-pr-2">
                                                     <img class="tw-w-8 tw-h-8 tw-object-cover tw-rounded-full" src="{{$r['image']}}" />
                                                 </div>

module/Member/View/pc/memberVip/index.blade.php

@@ -196,7 +196,7 @@ class="vip-button">
                             <div class="row">
                                 @foreach($memberVipRights as $r)
                                     <div class="col-lg-2 col-md-3 col-6" style="display:none;" data-vip-right="{{join(',',$r['vipIds'])}}">
-                                        <div class="tw-flex tw-items-center ub-text-small">
+                                        <div class="tw-flex tw-items-center ub-text-sm">
                                             <div class="tw-pr-2">
                                                 <img class="tw-w-8 tw-h-8 tw-object-cover tw-rounded-full" src="{{$r['image']}}" />
                                             </div>

module/Member/View/pc/memberVip/indexDialog.blade.php

@@ -18,6 +18,7 @@
 class ModuleStoreUtil
 {
     const REMOTE_BASE = 'https://modstart.com';
+    // const REMOTE_BASE = 'http://org.demo.soft.host';
 
     public static function remoteModuleData()
     {

module/ModuleStore/Asset/entry/moduleStore.js

@@ -611,6 +611,9 @@ export default {
             }
         },
         doMemberLoginSubmit() {
+            if (!this.memberLoginInfo.username || !this.memberLoginInfo.password || !this.memberLoginInfo.captcha) {
+                return
+            }
             if (!this.memberLoginInfo.agree) {
                 this.$dialog.tipError('请先同意使用协议')
                 return

module/ModuleStore/Util/ModuleStoreUtil.php

@@ -0,0 +1,19 @@
+<?php
+
+
+namespace Module\Vendor\Api\Controller;
+
+use Illuminate\Routing\Controller;
+use ModStart\Core\Input\Response;
+use ModStart\Misc\Captcha\CaptchaFacade;
+
+class CaptchaController extends Controller
+{
+    public function image()
+    {
+        $captcha = CaptchaFacade::create('default');
+        return Response::generate(0, 'ok', [
+            'image' => 'data:image/png;base64,' . base64_encode($captcha->getOriginalContent()),
+        ]);
+    }
+}