From 1ccbade7711276a8deb933a4b3350d0f9fb183e4 Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Wed, 18 Dec 2024 17:12:12 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=AE=E5=BD=95=E6=95=B4=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages-drug/drug/drug-order-list.vue           | 156 ------------------
 pages.json                                    |  38 ++---
 .../allocation}/cashier/cashier.vue           |   0
 3 files changed, 19 insertions(+), 175 deletions(-)
 delete mode 100644 pages-drug/drug/drug-order-list.vue
 rename pages/{ => plugins/allocation}/cashier/cashier.vue (100%)

diff --git a/pages-drug/drug/drug-order-list.vue b/pages-drug/drug/drug-order-list.vue
deleted file mode 100644
index 77e476de..00000000
--- a/pages-drug/drug/drug-order-list.vue
+++ /dev/null
@@ -1,156 +0,0 @@
-<template>
-    <view :class="theme_view">
-        <block v-if="data_list_loding_status == 3">
-            <view class="padding-horizontal-main padding-vertical-xxxxl margin-main tc bg-white border-radius-main">
-                <view class="padding-vertical-xxxxl">
-                    <text class="fw-b cr-price text-size-xxl">{{payment_currency_symbol}}{{data.pay_price}}</text>
-                </view>
-                <view class="margin-top-sm padding-bottom-xxxxl">
-                    <view :class="'cr-'+(pay_status == 1 ? 'green' : (pay_status == 2 ? 'red' : 'grey'))">{{pay_msg}}</view>
-                </view>
-                <view v-if="pay_status == 2" class="margin-top-xxxxl padding-vertical-xxxxl">
-                    <button class="bg-green br-green cr-white round text-size-sm padding-horizontal-xxxxl" size="mini" hover-class="none" @tap="pay_handle">重新发起支付</button>
-                </view>
-            </view>
-            <view v-if="is_back_btn && pay_status != 0" class="margin-top-xxxxl padding-top-xxxxl tc">
-                <button class="bg-white br-main cr-main round text-size-sm padding-horizontal-xxxxl" size="mini" hover-class="none" open-type="launchApp" app-parameter="wechat">返回APP</button>
-            </view>
-        </block>
-        <block v-else>
-            <!-- 提示信息 -->
-            <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
-        </block>
-
-        <!-- 公共 -->
-        <component-common ref="common" :propIsAppAdmin="false"></component-common>
-    </view>
-</template>
-<script>
-    const app = getApp();
-    import componentCommon from '@/components/common/common';
-    import componentNoData from "@/components/no-data/no-data";
-    export default {
-        data() {
-            return {
-                theme_view: app.globalData.get_theme_value_view(),
-                payment_currency_symbol: app.globalData.currency_symbol(),
-                params: {},
-                data_list_loding_status: 1,
-                data_list_loding_msg: '',
-                scene: 0,
-                scene_back_arr: [1069, 1038, 1089, 1090, 1001, 1131, 1187],
-                is_back_btn: false,
-                data: {},
-                pay_status: 0,
-                pay_msg: '',
-            };
-        },
-
-        components: {
-            componentCommon,
-            componentNoData
-        },
-        onLoad(params) {
-            // 调用公共事件方法
-            app.globalData.page_event_onload_handle(params);
-
-            // 设置参数
-            params = app.globalData.launch_params_handle(params);
-            var scene = app.globalData.get_scene_data();
-            this.setData({
-                params: params,
-                scene: scene,
-                is_back_btn: this.scene_back_arr.indexOf(scene) != -1,
-            });
-
-            // 数据加载
-            this.get_data();
-        },
-
-        onShow() {
-            // 调用公共事件方法
-            app.globalData.page_event_onshow_handle();
-
-            // 公共onshow事件
-            if ((this.$refs.common || null) != null) {
-                this.$refs.common.on_show();
-            }
-        },
-
-        // 下拉刷新
-        onPullDownRefresh() {
-            this.get_data();
-        },
-
-        methods: {
-            // 初始化
-            get_data() {
-                uni.request({
-                    url: app.globalData.get_request_url("paydata", "cashier"),
-                    method: "POST",
-                    data: this.params,
-                    dataType: "json",
-                    success: (res) => {
-                        uni.stopPullDownRefresh();
-                        if (res.data.code == 0 && (res.data.data || null) != null) {
-                            this.setData({
-                                data_list_loding_status: 3,
-                                data_list_loding_msg: '',
-                                data: res.data.data,
-                            });
-
-                            // 直接调起支付
-                            this.pay_handle();
-                        } else {
-                            this.setData({
-                                data_list_loding_status: 0,
-                                data_list_loding_msg: res.data.msg,
-                            });
-                        }
-                    },
-                    fail: () => {
-                        uni.stopPullDownRefresh();
-                        this.setData({
-                            data_list_loding_status: 2,
-                            data_list_loding_msg: this.$t('common.internet_error_tips'),
-                        });
-                    },
-                });
-            },
-
-            // 支付处理
-            pay_handle(e) {
-                if(this.pay_status != 1)
-                {
-                    console.log(this.data);
-                    this.setData({
-                        pay_status: 0,
-                        pay_msg: this.$t('common.payment_in_text'),
-                    });
-                    uni.requestPayment({
-                        timeStamp: this.data.pay_data.timeStamp,
-                        nonceStr: this.data.pay_data.nonceStr,
-                        package: this.data.pay_data.package,
-                        signType: this.data.pay_data.signType,
-                        paySign: this.data.pay_data.paySign,
-                        success: (res) => {
-                            this.setData({
-                                pay_status: 1,
-                                pay_msg: this.$t('paytips.paytips.679rxu'),
-                            });
-                        },
-                        fail: (res) => {
-                            console.log(res)
-                            this.setData({
-                                pay_status: 2,
-                                pay_msg: this.$t('paytips.paytips.6y488i'),
-                            });
-                        },
-                    });
-                }
-            }
-        }
-    };
-</script>
-<style>
-</style>
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 1e2e72a5..197cc4e3 100644
--- a/pages.json
+++ b/pages.json
@@ -77,13 +77,6 @@
                 "enablePullDownRefresh": true,
                 "navigationBarTitleText": ""
             }
-        },
-        {
-            "path": "pages-drug/drug/drug-order-list",
-            "style": {
-                "enablePullDownRefresh": true,
-                "navigationBarTitleText": ""
-            }
         }
     ],
     "subPackages": [
@@ -511,18 +504,6 @@
                 }
             ]
         },
-        {
-            "root": "pages/cashier",
-            "pages": [
-                {
-                    "path": "cashier",
-                    "style": {
-                        "enablePullDownRefresh": true,
-                        "navigationBarTitleText": ""
-                    }
-                }
-            ]
-        },
         {
             "root": "pages/plugins/seckill",
             "pages": [
@@ -1710,6 +1691,25 @@
                     }
                 }
             ]
+        },
+        {
+            "root": "pages/plugins/allocation",
+            "pages": [
+                {
+                    "path": "cashier/cashier",
+                    "style": {
+                        // #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-KUAISHOU || APP
+                        "navigationStyle": "custom",
+                        // #endif
+                        // #ifdef MP-ALIPAY
+                        "transparentTitle": "auto",
+                        "titlePenetrate": "YES",
+                        // #endif
+                        "enablePullDownRefresh": false,
+                        "navigationBarTitleText": ""
+                    }
+                }
+            ]
         }
     ],
     "preloadRule": {
diff --git a/pages/cashier/cashier.vue b/pages/plugins/allocation/cashier/cashier.vue
similarity index 100%
rename from pages/cashier/cashier.vue
rename to pages/plugins/allocation/cashier/cashier.vue