xiongzhu %!s(int64=4) %!d(string=hai) anos
pai
achega
210454c14a

+ 12 - 0
cleadData.sql

@@ -0,0 +1,12 @@
+delete from order_info;
+delete from collection_info;
+delete from asset;
+delete from like_info;
+delete from blind_box_item;
+delete from appointment;
+delete from user_authority where user_id > 1;
+delete from user_address;
+delete from user_token;
+delete from banner;
+delete from identity_auth;
+delete from user where id > 196;

+ 2 - 2
src/main/nine-space/src/components/product/productInfo.vue

@@ -18,9 +18,9 @@
             <div class="price" v-if="info.salable"><i class="font_family icon-icon_jiage"></i>{{ info.price }}</div>
             <div class="status" v-else>仅展示</div>
             <div class="text">
-                <div class="text1" v-if="info.stock">
+                <div class="text1" v-if="info.salable">
                     <span>{{ info.sale }}/</span>
-                    <span>{{ info.stock }}</span>
+                    <span>{{ info.total }}</span>
                 </div>
                 <div class="flex1"></div>
                 <like-button :isLike="info.liked" @click="likeProduct">

+ 1 - 1
src/main/vue/src/views/BlindBoxEdit.vue

@@ -20,7 +20,7 @@
                         <el-input v-model="formData.name" :disabled="!canEdit"></el-input>
                     </el-form-item>
                     <el-form-item prop="pics" label="图片">
-                        <object-upload v-model="formData.pics[0]" :disabled="!canEdit"></object-upload>
+                        <object-upload v-model="formData.pics[0]" :disabled="!canEdit" compress width="3000" height="3000"></object-upload>
                     </el-form-item>
                     <el-form-item prop="minterId" label="创建者">
                         <minter-select

+ 1 - 1
src/main/vue/src/views/CollectionEdit.vue

@@ -20,7 +20,7 @@
                         <el-input v-model="formData.name" :disabled="!canEdit"></el-input>
                     </el-form-item>
                     <el-form-item prop="pics" label="图片">
-                        <object-upload v-model="formData.pics[0]" :disabled="!canEdit" compress></object-upload>
+                        <object-upload v-model="formData.pics[0]" :disabled="!canEdit" compress width="3000" height="3000"></object-upload>
                         <div class="tip">支持JPG、PNG、GIF、MP4,推荐长宽比1:1</div>
                     </el-form-item>
                     <el-form-item prop="minterId" label="铸造者">