Merge branch 'dev' of http://git.izouma.com/xiongzhu/raex_front into dev

src/components/PageBar.vue

@@ -2,7 +2,7 @@
     <div class="bar">
         <div>
             <div class="text1">
-                <slot>绿洲宇宙</slot>
+                <slot>RAEX宇宙</slot>
             </div>
             <div class="text2">
                 <span> <slot name="sub"></slot></span>

src/components/PayMethodPick.vue

@@ -37,27 +37,39 @@ export default {
         if (this.value) {
             this.checked = this.value;
         }
-        this.$http.get('/sysConfig/get/pay_config').then(res => {
-            let configs = JSON.parse(res.value).filter(item => {
-                if (item.key === 'BALANCE') {
-                    return this.userInfo && this.userInfo.walletEnabled;
+        if (
+            (this.$store.state.review && window.cordova && window.cordova.platformId === 'ios') ||
+            navigator.userAgent.includes('#review#')
+        ) {
+            this.payConfig = [
+                {
+                    name: '绿洲石',
+                    key: 'BALANCE',
+                    icon: 'https://cdn.raex.vip/image/2022-05-18-17-46-19eDglIIAy.png',
+                    show: true,
+                    enabled: true
                 }
-                return true;
-            });
-            if (this.inWeixin) {
-                configs.forEach(item => {
-                    if (item.key === 'ALIPAY') {
-                        item.key = 'ALIPAY_BRIDGE';
+            ];
+            this.checked = 'BALANCE';
+        } else {
+            this.$http.get('/sysConfig/get/pay_config').then(res => {
+                let configs = JSON.parse(res.value).filter(item => {
+                    if (item.key === 'BALANCE') {
+                        return this.userInfo && this.userInfo.walletEnabled;
                     }
+                    return true;
                 });
-            }
-            this.payConfig = configs.sort((a, b) => a.sort - b.sort);
-            if (window.cordova && window.cordova.platformId === 'ios' && this.$store.state.review) {
-                this.checked = 'IAP';
-            } else {
+                if (this.inWeixin) {
+                    configs.forEach(item => {
+                        if (item.key === 'ALIPAY') {
+                            item.key = 'ALIPAY_BRIDGE';
+                        }
+                    });
+                }
+                this.payConfig = configs.sort((a, b) => a.sort - b.sort);
                 this.checked = (configs.find(i => i.show && i.enabled) || {}).key;
-            }
-        });
+            });
+        }
     },
     data() {
         return {

src/main.js

@@ -154,8 +154,11 @@ const loadSplash = (onload, onerror) =>
         splash.src = 'https://cdn.raex.vip/splash.jpg';
         document.body.append(splash);
     });
-
+if (navigator.userAgent.includes('#review#')) {
+    store.commit('setReview', true);
+}
 if (navigator.userAgent.includes('#cordova#')) {
+    store.commit('setPlatform', window.cordova.platformId);
     document.addEventListener(
         'deviceready',
         function () {

src/store/index.js

@@ -19,7 +19,8 @@ export default createStore({
         usedBuy: true,
         showConsole: false,
         bankCard: null,
-        showRoomId: null
+        showRoomId: null,
+        platform: ''
     },
     mutations: {
         setFinished(state, finished) {
@@ -72,6 +73,9 @@ export default createStore({
         },
         setShowRoomId(state, showRoomId) {
             state.showRoomId = showRoomId;
+        },
+        setPlatform(state, platform) {
+            state.platform = platform;
         }
     },
     actions: {

src/views/Creator.vue

@@ -83,7 +83,6 @@ export default {
 </script>
 
 <style lang="less" scoped>
-
 .top {
     display: flex;
     padding: 10px 16px;

src/views/Discover.vue

@@ -69,7 +69,7 @@
             </div>
         </div>
 
-        <van-grid :border="false" :column-num="$store.state.review ? 3 : 4">
+        <van-grid :border="false" :column-num="$store.state.review ? 2 : 4">
             <van-grid-item
                 text="绿洲头条"
                 :to="{
@@ -89,7 +89,7 @@
                     <img class="grid-img" src="@assets/discover/info_icon_lvzhougongyi.png" />
                 </template>
             </van-grid-item>
-            <van-grid-item text="拍卖中心" @click="wait">
+            <van-grid-item text="拍卖中心" @click="wait" v-if="!$store.state.review">
                 <template v-slot:icon>
                     <img class="grid-img" src="@assets/info_icon_paimaixilie.png" />
                 </template>

src/views/Mine.vue

@@ -169,7 +169,7 @@
                     <van-icon :name="require('@assets/icon_kefuliuyan.png')" class="search-icon" />
                 </template>
             </van-grid-item>
-            <van-grid-item text="交易历史" :to="{ path: '/mineExchange' }">
+            <van-grid-item text="交易历史" :to="{ path: '/mineExchange' }" v-if="!$store.state.review">
                 <template #icon>
                     <van-icon :name="require('@assets/info_icon_jiaoyijilu.png')" class="search-icon" />
                 </template>

src/views/Submit.vue

@@ -30,9 +30,7 @@
 
                 <!-- <van-field type="text" label="订单留言" placeholder="选填" v-model="message" /> -->
 
-                <div class="pay" v-if="!($store.state.review && inIos)">
-                    <pay-method-pick v-model="payType"></pay-method-pick>
-                </div>
+                <pay-method-pick v-model="payType"></pay-method-pick>
             </div>
         </div>
 

src/views/account/Introduction.vue

@@ -4,7 +4,7 @@
             <div>
                 <div class="align-center">平台简介</div>
                 <p>
-                    RAEXRAEX宇宙是全球领先的专业艺术品生态簇运营商，重点打造“全球领先数字藏品生态簇”的产业闭环，持续塑造推出中国权威数字文创商品，参与全球数字藏品定价体系，加速“一带一路”的全球文化内容输出。在这里您可以创造、收集、售卖您的艺术品及数字手办潮玩，感受全球顽家为您带来的新奇别致体验，共同探索艺术宇宙的真实奥秘！欢迎您的加入！
+                    RAEX宇宙是全球领先的专业艺术品生态簇运营商，重点打造“全球领先数字藏品生态簇”的产业闭环，持续塑造推出中国权威数字文创商品，参与全球数字藏品定价体系，加速“一带一路”的全球文化内容输出。在这里您可以创造、收集、售卖您的艺术品及数字手办潮玩，感受全球顽家为您带来的新奇别致体验，共同探索艺术宇宙的真实奥秘！欢迎您的加入！
                 </p>
                 <p>
                     RAEX宇宙，是元宇宙游戏《The Oasis

src/views/activity/Submit.vue

@@ -33,30 +33,7 @@
             </div>
         </div>
 
-        <div class="pay" v-if="!$store.state.review">
-            <pay-method-pick v-model="payType"></pay-method-pick>
-
-            <!-- <div class="img-icon">
-                    <img class="icon" src="@assets/icon_RMB.png" alt="" />
-                </div>
-                <span>数字人民币</span>
-                <img class="choose-icon" :src="icons[2]" alt="" />
-            </div>
-            <div class="pay-item not" @click="wait">
-                <div class="img-icon">
-                    <img class="icon" src="@assets/icon-jifen1.png" alt="" />
-                </div>
-                <span>积分</span>
-                <img class="choose-icon" :src="icons[2]" alt="" />
-            </div>
-            <div class="pay-item not" @click="wait">
-                <div class="img-icon">
-                    <img class="icon" src="@assets/icon-lvzhoushi.png" alt="" />
-                </div>
-                <span>绿洲石</span>
-                <img class="choose-icon" :src="icons[2]" alt="" />
-            </div> -->
-        </div>
+        <pay-method-pick v-model="payType"></pay-method-pick>
 
         <div class="bottom van-safe-area-bottom" ref="bottom">
             <div class="bottom-content">

src/views/asset/Consignment.vue

@@ -141,8 +141,8 @@ export default {
             this.royalties = res.royalties || 5;
             this.serviceCharge = res.serviceCharge || 5;
 
-            this.$http.post('/asset/getRoyalties?id=' + this.$route.query.id).then(res=>{
-                this.royalties =res
+            this.$http.post('/asset/getRoyalties?id=' + this.$route.query.id).then(res => {
+                this.royalties = res;
             });
         });
     },
@@ -256,9 +256,6 @@ export default {
             &:not(:last-child) {
                 border-right: 1px solid @text3;
             }
-            i {
-                // background-color: #fff;
-            }
         }
     }
 }
@@ -300,9 +297,6 @@ export default {
                     border-right: 1px solid @text3;
                 }
                 border: 1px solid @text3;
-                i {
-                    // background-color: #fff;
-                }
             }
         }
     }
@@ -315,7 +309,6 @@ export default {
         color: @text0;
         line-height: 24px;
     }
-    // background-color: @bg3;;
     padding-bottom: 280px;
     .title {
         font-size: 14px;

src/views/user/Wallet.vue

@@ -14,14 +14,21 @@
             </div>
         </div>
         <div class="balance-amount" v-if="userInfo && userInfo.walletEnabled">
-            <div class="label">账户余额（元）</div>
+            <div class="label" v-if="$store.state.review">绿洲石余额</div>
+            <div class="label" v-else>账户余额（元）</div>
             <div class="value">
                 <span class="number"> {{ Number(userBalance.balance || 0).toFixed(2) }}</span>
-                <button class="btn-withdraw" @click="showWithdrawDialog = true" v-if="enableWithdraw">提现</button>
+                <button
+                    class="btn-withdraw"
+                    @click="showWithdrawDialog = true"
+                    v-if="enableWithdraw && !$store.state.review"
+                >
+                    提现
+                </button>
                 <button class="btn-recharge" @click="showRechargeDialog = true" v-if="enableRecharge">充值</button>
             </div>
         </div>
-        <div class="cell-group">
+        <div class="cell-group" v-if="!$store.state.review">
             <div class="cell" @click="$router.push({ name: 'mineBanks' })">
                 <img class="icon" src="@assets/icon_yinhangka.png" />
                 <span class="label">我的银行卡</span>