2 Commits

  1. 12
      app/build.gradle
  2. 2
      app/src/main/assets/apps/__UNI__3B4D40B/www/app-service.js
  3. 2
      app/src/main/assets/data/dcloud_control.xml
  4. 5
      uniapp_project_code/src/pages/pay/index.vue

12
app/build.gradle

@ -8,8 +8,8 @@ android {
minSdkVersion 21 minSdkVersion 21
targetSdkVersion 28 //21 io.dcloud.PandoraEntry apk入口时 targetSDKVersion>=21 targetSdkVersion 28 //21 io.dcloud.PandoraEntry apk入口时 targetSDKVersion>=21
versionCode 114
versionName "1.1.4"
versionCode 117
versionName "1.1.7"
multiDexEnabled true multiDexEnabled true
ndk { ndk {
// abiFilters 'x86','armeabi-v7a' // abiFilters 'x86','armeabi-v7a'
@ -36,9 +36,9 @@ android {
buildTypes { buildTypes {
release { release {
signingConfig signingConfigs.config signingConfig signingConfigs.config
zipAlignEnabled true
minifyEnabled true
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
// zipAlignEnabled false
// minifyEnabled false
// proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
} }
debug { debug {
signingConfig signingConfigs.config signingConfig signingConfigs.config
@ -97,7 +97,7 @@ dependencies {
implementation 'androidx.appcompat:appcompat:1.1.0' implementation 'androidx.appcompat:appcompat:1.1.0'
//leakcanary-debug模式下分析内存泄露 //leakcanary-debug模式下分析内存泄露
debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.12'
// debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.12'
// uni-app插件 // uni-app插件
implementation project(':uniplugin_component') implementation project(':uniplugin_component')
implementation project(':uniplugin_module') implementation project(':uniplugin_module')

2
app/src/main/assets/apps/__UNI__3B4D40B/www/app-service.js
File diff suppressed because it is too large
View File

2
app/src/main/assets/data/dcloud_control.xml

@ -1,5 +1,5 @@
<!--注意:正式版要改为false!!--> <!--注意:正式版要改为false!!-->
<hbuilder debug="true" syncDebug="true">
<hbuilder debug="false" syncDebug="false">
<apps> <apps>
<app appid="__UNI__3B4D40B" appver=""/> <app appid="__UNI__3B4D40B" appver=""/>
</apps> </apps>

5
uniapp_project_code/src/pages/pay/index.vue

@ -367,7 +367,6 @@
printOrder(checkInfo){ printOrder(checkInfo){
console.warn("printOrder checkInfo: ",checkInfo) console.warn("printOrder checkInfo: ",checkInfo)
util.showNone("小票打印中...")
let {store_id,brand_id,token} = getApp().globalData.accountInfo let {store_id,brand_id,token} = getApp().globalData.accountInfo
let stadiumInfo = uni.getStorageSync('stadiumInfo') let stadiumInfo = uni.getStorageSync('stadiumInfo')
let {venue_name} = stadiumInfo let {venue_name} = stadiumInfo
@ -376,6 +375,10 @@
let {finishedDate:time,transNo:order_no} = checkInfo.payRes.res let {finishedDate:time,transNo:order_no} = checkInfo.payRes.res
time = this.getTimeFromFinishedDate(time) time = this.getTimeFromFinishedDate(time)
if(!checkInfo||!order_no)return;
util.showNone("小票打印中...")
let print_info = { let print_info = {
...this.dataQuery,venue_name,time,order_no ...this.dataQuery,venue_name,time,order_no
} }

Loading…
Cancel
Save