虚拟币

lang/en.json

@@ -28,6 +28,7 @@
 		"all": "All",
 		"share": "Share",
 		"return": "Return",
+        "view_text": "Check",
 		"processing_in_text": "Processing",
 		"loading_in_text": "Loading",
 		"upload_in_text": "Uploading",

lang/zh.json

@@ -28,6 +28,7 @@
 		"all": "全部",
 		"share": "分享",
 		"return": "返回",
+        "view_text": "查看",
 		"processing_in_text": "处理中...",
 		"loading_in_text": "加载中...",
 		"upload_in_text": "上传中...",

pages/plugins/coin/convert/convert.vue

@@ -18,7 +18,7 @@
                                 </view>
                             </view>
                             <view class="coin-num pr flex-col">
-                                <input type="digit" name="coin" :value="default_value" class="num input-br text-size" placeholder-class="text-size-sm cr-grey-9" placeholder="请输入" @input="default_value_change" />
+                                <input type="digit" name="coin" :value="default_value" class="num input-br text-size" placeholder-class="text-size-sm cr-grey-9" placeholder="请输入" @input="default_coin_change_event" />
                                 <view class="margin-top-main tr text-size-xs">{{ accounts_list[send_accounts_id_index]['platform_symbol'] }}{{ accounts_list[send_accounts_id_index]['default_coin'] }}</view>
                             </view>
                         </view>
@@ -214,23 +214,31 @@
                     popup_coin_status: true,
                 });
             },
+            // 切换账户
             coin_checked_event(e) {
+                var index = parseInt(e.currentTarget.dataset.index || 0);
+                var old_index = (this.coin_type == 1) ? this.receive_accounts_id_index : this.send_accounts_id_index;
+                if(index == old_index) {
+                    app.globalData.showToast('转出和接收选择不能相同');
+                    return false;
+                }
                 if (this.coin_type == 1) {
                     this.setData({
-                        send_accounts_id_index: parseInt(e.currentTarget.dataset.index || 0),
+                        send_accounts_id_index: index,
                         send_accounts_id: e.currentTarget.dataset.value,
                     });
                 } else {
                     this.setData({
-                        receive_accounts_id_index: parseInt(e.currentTarget.dataset.index || 0),
+                        receive_accounts_id_index: index,
                         receive_accounts_id: e.currentTarget.dataset.value,
                     });
                 }
                 this.setData({
-                    coin_index: parseInt(e.currentTarget.dataset.index || 0),
+                    coin_index: index,
                     popup_coin_status: false,
                 });
             },
+            // 关闭账户选择弹窗
             popup_coin_status_close_event() {
                 this.setData({
                     popup_coin_status: false,
@@ -251,7 +259,8 @@
                     convert_bool: !this.convert_bool,
                 });
             },
-            default_value_change(e) {
+            // 需要转换的值事件
+            default_coin_change_event(e) {
                 this.setData({
                     default_value: e.detail.value,
                     convert_value: Math.round(e.detail.value * this.accounts_list[this.receive_accounts_id_index]['platform_rate'] * 100) / 100,

pages/user-orderaftersale-detail/user-orderaftersale-detail.css

@@ -18,7 +18,7 @@
 * 类型选择
 */
 .choose-type .choose-item {
-    width: calc(50% - 55rpx);
+    width: calc(50% - 60rpx);
     -webkit-transition: border-color .2s ease-in;
     -moz-transition: border-color .2s ease-in;
     -ms-transition: border-color .2s ease-in;

pages/user-orderaftersale-detail/user-orderaftersale-detail.vue

@@ -66,7 +66,7 @@
                 <!-- 提示/退货 -->
                 <view v-if="new_aftersale_data.status <= 2" class="msg-tips padding-main border-radius-main spacing-mb">
                     <text class="msg-text">{{ new_aftersale_data.tips_msg.title }}</text>
-                    <text class="msg-a" @tap="show_aftersale_event">查看 >></text>
+                    <text class="msg-a" @tap="show_aftersale_event"> {{$t('common.view_text')}} >></text>
                     <view v-if="new_aftersale_data.status == 1 && new_aftersale_data.type == 1 && return_goods_address != null" class="margin-top-sm oh">
                         <button class="bg-green cr-white round dis-block fl" type="default" size="mini" @tap="delivery_submit_event">{{$t('user-orderaftersale-detail.user-orderaftersale-detail.uuhf62')}}</button>
                     </view>
@@ -87,7 +87,7 @@
                 <!-- 提示 -->
                 <view v-if="new_aftersale_data.status >= 3" :class="'msg-tips padding-main border-radius-main spacing-mb ' + (new_aftersale_data.status == 3 ? 'msg-tips-success' : new_aftersale_data.status == 4 ? 'msg-tips-danger' : 'msg-tips-warning')">
                     <text class="msg-text">{{ new_aftersale_data.tips_msg.title }}</text>
-                    <text class="msg-a margin-left-sm" @tap="show_aftersale_event">查看 >></text>
+                    <text class="msg-a margin-left-sm" @tap="show_aftersale_event"> {{$t('common.view_text')}} >></text>
                 </view>
 
                 <!-- 详情 -->
@@ -410,7 +410,7 @@ export default {
                             return_money_goods_reason: data.return_money_goods_reason || [],
                             aftersale_type_list: data.aftersale_type_list || [],
                             return_goods_address: data.return_goods_address || null,
-                            form_price: data.returned_data || null != null ? data.returned_data.refund_price : 0,
+                            form_price: data.returned_data || null != null ? data.returned_data.refund_price : '',
                             plugins_intellectstools_data: data.plugins_intellectstools_data || null,
                         });
                     } else {
@@ -590,14 +590,16 @@ export default {
                 images: this.form_images_list.length > 0 ? JSON.stringify(this.form_images_list) : "",
             };
 
-            // 防止金额大于计算的金额
-            if (form_data["price"] > this.returned_data["refund_price"]) {
-                form_data["price"] = this.returned_data["refund_price"];
+            // 防止金额大于计算的金额
+            var refund_price = parseFloat(this.returned_data["refund_price"]);
+            if (form_data["price"] > refund_price) {
+                form_data["price"] =refund_price;
             }
 
-            // 防止数量大于计算的数量
-            if (form_data["number"] > this.returned_data["returned_quantity"]) {
-                form_data["number"] = this.returned_data["returned_quantity"];
+            // 防止数量大于计算的数量
+            var returned_quantity = parseInt(this.returned_data["returned_quantity"]);
+            if (form_data["number"] > returned_quantity) {
+                form_data["number"] = returned_quantity;
             }
 
             // 数据校验
@@ -617,7 +619,7 @@ export default {
                     fields: "number",
                     msg: this.$t('user-orderaftersale-detail.user-orderaftersale-detail.dn3423'),
                 });
-            }
+            }
 
             // 校验参数并提交
             if (app.globalData.fields_check(form_data, validation)) {