Browse Source

no message

DaMowang 2 years ago
parent
commit
81e574881a
4 changed files with 529 additions and 265 deletions
  1. 483 225
      package-lock.json
  2. 35 31
      package.json
  3. 0 4
      src/pages/product/p_details.vue
  4. 11 5
      src/pagesB/cinema/confirmOrder.vue

File diff suppressed because it is too large
+ 483 - 225
package-lock.json


+ 35 - 31
package.json

@@ -44,51 +44,55 @@
     "test:mp-weixin": "cross-env UNI_PLATFORM=mp-weixin jest -i"
   },
   "dependencies": {
-    "@dcloudio/uni-app-plus": "^2.0.1-32920211122003",
-    "@dcloudio/uni-h5": "^2.0.1-32920211122003",
+    "@dcloudio/uni-app": "2.0.2-3080720230703001",
+    "@dcloudio/uni-app-plus": "2.0.2-3080720230703001",
+    "@dcloudio/uni-h5": "2.0.2-3080720230703001",
     "@dcloudio/uni-helper-json": "*",
-    "@dcloudio/uni-i18n": "^2.0.1-32920211122003",
-    "@dcloudio/uni-mp-360": "^2.0.1-32920211122003",
-    "@dcloudio/uni-mp-alipay": "^2.0.1-32920211122003",
-    "@dcloudio/uni-mp-baidu": "^2.0.1-32920211122003",
-    "@dcloudio/uni-mp-kuaishou": "^2.0.1-32920211122003",
-    "@dcloudio/uni-mp-lark": "^2.0.1-32920211122003",
-    "@dcloudio/uni-mp-qq": "^2.0.1-32920211122003",
-    "@dcloudio/uni-mp-toutiao": "^2.0.1-32920211122003",
-    "@dcloudio/uni-mp-vue": "^2.0.1-32920211122003",
-    "@dcloudio/uni-mp-weixin": "^2.0.1-32920211122003",
-    "@dcloudio/uni-quickapp-native": "^2.0.1-32920211122003",
-    "@dcloudio/uni-quickapp-webview": "^2.0.1-32920211122003",
-    "@dcloudio/uni-stat": "^2.0.1-32920211122003",
+    "@dcloudio/uni-i18n": "2.0.2-3080720230703001",
+    "@dcloudio/uni-mp-360": "2.0.2-3080720230703001",
+    "@dcloudio/uni-mp-alipay": "2.0.2-3080720230703001",
+    "@dcloudio/uni-mp-baidu": "2.0.2-3080720230703001",
+    "@dcloudio/uni-mp-jd": "2.0.2-3080720230703001",
+    "@dcloudio/uni-mp-kuaishou": "2.0.2-3080720230703001",
+    "@dcloudio/uni-mp-lark": "2.0.2-3080720230703001",
+    "@dcloudio/uni-mp-qq": "2.0.2-3080720230703001",
+    "@dcloudio/uni-mp-toutiao": "2.0.2-3080720230703001",
+    "@dcloudio/uni-mp-vue": "2.0.2-3080720230703001",
+    "@dcloudio/uni-mp-weixin": "2.0.2-3080720230703001",
+    "@dcloudio/uni-mp-xhs": "2.0.2-3080720230703001",
+    "@dcloudio/uni-quickapp-native": "2.0.2-3080720230703001",
+    "@dcloudio/uni-quickapp-webview": "2.0.2-3080720230703001",
+    "@dcloudio/uni-stacktracey": "2.0.2-3080720230703001",
+    "@dcloudio/uni-stat": "2.0.2-3080720230703001",
     "@dcloudio/uni-ui": "^1.4.28",
-    "@vue/shared": "^3.0.0",
+    "@vue/shared": "3.3.4",
     "core-js": "^3.6.5",
     "dayjs": "^1.11.6",
-    "flyio": "^0.6.2",
+    "flyio": "0.6.14",
     "js-md5": "^0.7.3",
     "regenerator-runtime": "^0.12.1",
     "uqrcodejs": "^4.0.6",
     "vue": "^2.6.11",
-    "vuex": "^3.2.0"
+    "vuex": "3.6.2"
   },
   "devDependencies": {
     "@babel/runtime": "~7.12.0",
     "@dcloudio/types": "*",
-    "@dcloudio/uni-automator": "^2.0.1-32920211122003",
-    "@dcloudio/uni-cli-i18n": "^2.0.1-32920211122003",
-    "@dcloudio/uni-cli-shared": "^2.0.1-32920211122003",
-    "@dcloudio/uni-migration": "^2.0.1-32920211122003",
-    "@dcloudio/uni-template-compiler": "^2.0.1-32920211122003",
-    "@dcloudio/vue-cli-plugin-hbuilderx": "^2.0.1-32920211122003",
-    "@dcloudio/vue-cli-plugin-uni": "^2.0.1-32920211122003",
-    "@dcloudio/vue-cli-plugin-uni-optimize": "^2.0.1-32920211122003",
-    "@dcloudio/webpack-uni-mp-loader": "^2.0.1-32920211122003",
-    "@dcloudio/webpack-uni-pages-loader": "^2.0.1-32920211122003",
+    "@dcloudio/uni-automator": "2.0.2-3080720230703001",
+    "@dcloudio/uni-cli-i18n": "2.0.2-3080720230703001",
+    "@dcloudio/uni-cli-shared": "2.0.2-3080720230703001",
+    "@dcloudio/uni-migration": "2.0.2-3080720230703001",
+    "@dcloudio/uni-template-compiler": "2.0.2-3080720230703001",
+    "@dcloudio/vue-cli-plugin-hbuilderx": "2.0.2-3080720230703001",
+    "@dcloudio/vue-cli-plugin-uni": "2.0.2-3080720230703001",
+    "@dcloudio/vue-cli-plugin-uni-optimize": "2.0.2-3080720230703001",
+    "@dcloudio/webpack-uni-mp-loader": "2.0.2-3080720230703001",
+    "@dcloudio/webpack-uni-pages-loader": "2.0.2-3080720230703001",
     "@vue/cli-plugin-babel": "~4.5.0",
     "@vue/cli-service": "~4.5.0",
-    "babel-plugin-import": "^1.11.0",
-    "cross-env": "^7.0.2",
-    "jest": "^25.4.0",
+    "babel-plugin-import": "1.13.8",
+    "cross-env": "7.0.3",
+    "jest": "25.5.4",
     "mini-types": "*",
     "miniprogram-api-typings": "*",
     "postcss-comment": "^2.0.0",

+ 0 - 4
src/pages/product/p_details.vue

@@ -512,10 +512,6 @@ page {
     color: #2db389;
 }
 
-.goods_raido {
-    // margin-right: 180rpx;
-}
-
 .close_img {
     width: 36rpx;
     height: 36rpx;

+ 11 - 5
src/pagesB/cinema/confirmOrder.vue

@@ -40,10 +40,7 @@
         </div>
         <div class="msg card">
             <div class="m_tit">购票须知</div>
-            <p>1.请确认场次和时间无误,购买成功后将不予退换</p>
-            <p>2.由于设备故障等不可抗力因素,存在少量场次取消的情况,会进行退票退款</p>
-            <p>3.由于影院系统不稳定等因素,存在出票失败的情况,会进行退款</p>
-            <p>4.取票码可以在“我的-本地生活-历史订单”中查看</p>
+            <p v-for="(i,s) in cinemadesc[0]" :key="s">{{ i }}</p>
         </div>
 
         <div class="btnbar" @click="pay">立即支付</div>
@@ -68,6 +65,7 @@ export default {
             deduction: 0,
             actuallypaid: 0,
             chabao: 0,
+            cinemadesc: [], //购票须知
         };
     },
     methods: {
@@ -110,13 +108,21 @@ export default {
                     });
                 }
             })
+        },
+        cinemaDesc(){
+            post("local/cinemaDesc").then(res=>{
+                if (res.code == 0) {
+                    this.cinemadesc = res.data
+                }
+            })
         }
     },
     onLoad(da) {
         for (let p of this.OrderDa.oldArray) {
             this.cartTotal = this.$h.Add(this.cartTotal,p.Price)
         }
-        this.getIntegral()
+        this.getIntegral();
+        this.cinemaDesc();
     },
     onShow() {},
     mounted() {},

Some files were not shown because too many files changed in this diff