星图

src/components/PayBalance.vue

@@ -5,7 +5,7 @@
         title="请输入支付密码"
         confirmButtonText="立即支付"
         show-cancel-button
-        confirmButtonColor="#3ab200"
+        :confirmButtonColor="isStar ? '#00B897' : '#3ab200'"
         @cancel="(showPwdDialog = false), $toast.clear()"
         @confirm="pay"
     >
@@ -22,6 +22,10 @@ export default {
         tradeCode: {
             type: String,
             default: ''
+        },
+        isStar: {
+            type: Boolean,
+            default: false
         }
     },
     setup(props, context) {

src/components/PayMethodPick.vue

@@ -14,7 +14,7 @@
                 <span>{{ item.name }}</span>
                 <img
                     class="choose-icon"
-                    :src="item.enabled ? (checked === item.key ? icons[1] : icons[0]) : icons[2]"
+                    :src="item.enabled ? (checked === item.key ? (isStar ? icons[3] : icons[1]) : icons[0]) : icons[2]"
                     alt=""
                 />
             </div>
@@ -33,6 +33,10 @@ export default {
         onlyBalance: {
             type: Boolean,
             default: false
+        },
+        isStar: {
+            type: Boolean,
+            default: false
         }
     },
     computed: {
@@ -92,7 +96,8 @@ export default {
             icons: [
                 require('@assets/svgs/icon_gouxuan_huise.svg'),
                 require('@assets/icon_gouxuan_pre.png'),
-                require('@assets/icon_gouxuan_huise1.png')
+                require('@assets/icon_gouxuan_huise1.png'),
+                require('@assets/icon_gouxuan_pre2.png')
             ]
         };
     },

src/components/star/pay.vue

@@ -15,16 +15,14 @@
                 <div class="line"></div>
                 <div class="title-methods">支付方式</div>
                 <div style="padding: 0 16px">
-                    <pay-method-pick v-model="payMethod"></pay-method-pick>
+                    <pay-method-pick v-model="payMethod" isStar></pay-method-pick>
                 </div>
             </div>
             <div class="btn-wrapper">
-                <van-button type="primary" :color="$colors.prim" round block class="btn-recharge" @click="pay">
-                    立即支付
-                </van-button>
+                <van-button type="primary" round block class="btn-recharge" @click="pay"> 立即支付 </van-button>
             </div>
         </van-action-sheet>
-        <pay-balance v-model:tradeCode="tradeCode" ref="payBalance" @pay="pay"></pay-balance>
+        <pay-balance isStar v-model:tradeCode="tradeCode" ref="payBalance" @pay="pay"></pay-balance>
     </div>
 </template>
 

src/views/activity/ChooseProduct.vue

@@ -47,8 +47,9 @@
                                 />
                                 <div class="product-info">
                                     <div class="text1 van-ellipsis">{{ item.name }}</div>
-                                    <div class="flex1"></div>
-                                    <div class="text2" v-if="item.category">{{ item.category }}</div>
+                                    <div class="text2-list">
+                                        <div class="text2" v-if="item.category">{{ item.category }}</div>
+                                    </div>
                                 </div>
                             </div>
                             <div class="product-desc" v-if="getChooseNum(item.collectionInfos)">
@@ -83,8 +84,10 @@
                                     />
                                     <div class="product-info">
                                         <div class="text1 van-ellipsis">{{ pro.name }}</div>
-                                        <div class="flex1"></div>
-                                        <div class="text2" v-if="item.number">编号：{{ pro.number }}</div>
+                                        <!-- <div class="flex1"></div> -->
+                                        <div class="text2-list">
+                                            <div class="text2" v-if="item.number">编号：{{ pro.number }}</div>
+                                        </div>
                                     </div>
                                 </div>
                             </div>
@@ -115,9 +118,10 @@
                             />
                             <div class="product-info">
                                 <div class="text1 van-ellipsis">{{ item.name }}</div>
-                                <div class="flex1"></div>
-                                <div class="text2" v-if="item.category">{{ item.category }}</div>
-                                <div class="text2" v-if="item.number">编号：{{ item.number }}</div>
+                                <div class="text2-list">
+                                    <div class="text2" v-if="item.category">{{ item.category }}</div>
+                                    <div class="text2" v-if="item.number">编号：{{ item.number }}</div>
+                                </div>
                             </div>
                         </div>
                         <div class="num-right" @click.stop="" v-if="item.collections">
@@ -545,11 +549,21 @@ export default {
                 color: #000000;
                 line-height: 24px;
             }
+            .text2-list {
+                .flex();
+                margin-top: 6px;
+            }
 
             .text2 {
                 font-size: 12px;
                 color: @text3;
-                line-height: 17px;
+                line-height: 18px;
+                background: #f5f7fa;
+                border-radius: 2px;
+                padding: 0 6px;
+            }
+            .text2 + .text2 {
+                margin-left: 10px;
             }
         }
     }

src/views/activity/Submit.vue

@@ -26,9 +26,10 @@
                 <van-image width="60" height="60" radius="6" :src="getImg(changeImgs(item.pic))" fit="cover" />
                 <div class="assets-info">
                     <div class="text1">{{ item.name }}</div>
-                    <div class="flex1"></div>
-                    <div class="text2" v-if="item.category">类型：{{ item.category }}</div>
-                    <div class="text2" v-if="item.number">编号：{{ item.number }}</div>
+                    <div class="text2-list">
+                        <div class="text2" v-if="item.category">类型：{{ item.category }}</div>
+                        <div class="text2" v-if="item.number">编号：{{ item.number }}</div>
+                    </div>
                 </div>
                 <div class="assets-num" v-if="item.num > 1">x{{ item.num }}</div>
             </div>
@@ -566,7 +567,18 @@ export default {
         .text2 {
             font-size: 12px;
             color: @text3;
-            line-height: 17px;
+            line-height: 18px;
+            padding: 0 6px;
+            background: #f5f7fa;
+            border-radius: 2px;
+        }
+
+        .text2-list {
+            .flex();
+            margin-top: 6px;
+        }
+        .text2 + .text2 {
+            margin-left: 10px;
         }
     }
 

src/views/order/ActivityDetail.vue

@@ -47,9 +47,10 @@
                     <van-image :radius="6" width="60" height="60" :src="getImg(changeImgs(item.pic))" fit="cover" />
                     <div class="product-content">
                         <div class="text1 van-multi-ellipsis--l2">{{ item.name }}</div>
-                        <div class="flex1"></div>
-                        <div class="text2" v-if="item.category">类型:{{ item.category }}</div>
-                        <div class="text2" v-if="item.number">编号:{{ item.number }}</div>
+                        <div class="text2-list">
+                            <div class="text2" v-if="item.category">类型:{{ item.category }}</div>
+                            <div class="text2" v-if="item.number">编号:{{ item.number }}</div>
+                        </div>
                     </div>
                 </div>
             </div>
@@ -287,10 +288,22 @@ export default {
                 line-height: 24px;
             }
 
+            .text2-list {
+                .flex();
+                margin-top: 6px;
+            }
+
             .text2 {
                 font-size: @font1;
-                color: @text3;
-                line-height: 17px;
+                padding: 0 6px;
+                color: #939599;
+                line-height: 18px;
+                background: #f5f7fa;
+                border-radius: 2px;
+            }
+
+            .text2 + .text2 {
+                margin-left: 10px;
             }
             .price {
                 font-size: @font1;

src/views/star/Create.vue

@@ -36,7 +36,7 @@
                         class="icon"
                         :src="
                             chooseId === item.id
-                                ? require('../../assets/icon_gouxuan_pre.png')
+                                ? require('../../assets/icon_gouxuan_pre2.png')
                                 : require('../../assets/icon_gouxuan_huise.png')
                         "
                         alt=""
@@ -51,9 +51,11 @@
                         />
                         <div class="product-info">
                             <div class="text1 van-ellipsis">{{ item.name }}</div>
-                            <div class="flex1"></div>
-                            <div class="text2" v-if="item.category">{{ item.category }}</div>
-                            <div class="text2" v-if="item.number">编号：{{ item.number }}</div>
+                            <!-- <div class="flex1"></div> -->
+                            <div class="text2-list">
+                                <div class="text2" v-if="item.category">{{ item.category }}</div>
+                                <div class="text2" v-if="item.number">编号：{{ item.number }}</div>
+                            </div>
                         </div>
                     </div>
                 </div>
@@ -407,6 +409,9 @@ export default {
 <style lang="less" scoped>
 .container {
     background-color: #272b2e;
+    --van-button-primary-background-color: #00b897;
+    --van-button-primary-border-color: #00b897;
+    --van-field-error-message-color: #00b897;
 }
 .steps {
     background: #fcdfa2;
@@ -528,10 +533,21 @@ export default {
                 line-height: 24px;
             }
 
+            .text2-list {
+                .flex();
+                margin-top: 6px;
+            }
+
             .text2 {
                 font-size: 12px;
                 color: @text3;
                 line-height: 17px;
+                background: #2d2f31;
+                border-radius: 2px;
+                padding: 0 6px;
+            }
+            .text2 + .text2 {
+                margin-left: 10px;
             }
         }
     }
@@ -557,7 +573,7 @@ export default {
     .van-button {
         &:nth-child(1) {
             width: 100px;
-            border: 1px solid #43ce00;
+            border: 1px solid #00b897;
         }
 
         &:nth-child(2) {
@@ -635,6 +651,7 @@ export default {
         color: #93959977;
         line-height: 24px;
     }
+
     .text2 {
         font-size: 12px;
         color: #93959977;

src/views/star/CreateResult.vue

@@ -36,7 +36,7 @@ export default {
                     img: require('@assets/png-fuhe.png'),
                     title: '提交成功',
                     sub: '<p>1. 绿洲宇宙的探索者，您的作品正在进行星图铸造！您可以在藏品室“个人作品”中查看您的星图！</p><p>2. 星图的铸造及审核冷却期为24小时，这期间不得进行展示与馈赠。完成铸造及审核后，即可进行展示与馈赠。</p><p>3. 赶快前往绿洲宇宙，在您的元宇宙空间及展厅中展示您的作品吧！</p>',
-                    color: '#43CE00'
+                    color: '#00B897'
                 };
             }
         }
@@ -110,7 +110,7 @@ export default {
     align-self: center;
     font-size: 20px;
     font-weight: bold;
-    color: #43ce00;
+    color: #00b897;
     line-height: 28px;
     margin: 6px 0 0;
 }
@@ -128,7 +128,7 @@ export default {
 .btn {
     margin-top: 80px;
     .van-button {
-        border: 1px solid #43ce00;
+        border: 1px solid #00b897;
     }
     .van-button + .van-button {
         margin-top: 20px;