root
/
school-peisong
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: root:ca8267fd6c302633d000daddeaa58741ccbd7626
Branches Tags
root:master
...
compare: root:c334e079743f07f625b148ce146cc0e8e237a3d5
Branches Tags
root:master

3 Commits
ca8267fd6c ... c334e07974

Author SHA1 Message Date
tianyi c334e07974 1
2 weeks ago
tianyi d3417b9c06 1
2 weeks ago
tianyi ac0da8973c 1
2 weeks ago
5 changed files with 73 additions and 168 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats
  1. 34
      App.vue
  2. 186
      manifest.json
  3. 6
      pages/login/login.vue
  4. 2
      pages/shop/orderDetail.vue
  5. 13
      pages/shop/shopEvaluate.vue

34
App.vue
View File

@ -71,6 +71,40 @@
}, },
onLaunch: function() { onLaunch: function() {
let context = this; let context = this;
//这里是热更新的代码
// #ifdef APP-PLUS
plus.runtime.getProperty(plus.runtime.appid, function(widgetInfo) {
console.log(widgetInfo.version)
console.log(widgetInfo.name)
// uni.request({
// url: '',
// data: {
// version: widgetInfo.version,
// name: widgetInfo.name
// },
// success: (result) => {
// var data = result.data;
// if (data.update && data.wgtUrl) {
// uni.downloadFile({
// url: data.wgtUrl,
// success: (downloadResult) => {
// if (downloadResult.statusCode === 200) {
// plus.runtime.install(downloadResult.tempFilePath, {
// force: false
// }, function() {
// console.log('install success...');
// plus.runtime.restart();
// }, function(e) {
// console.error('install fail...');
// });
// }
// }
// });
// }
// }
// });
});
// #endif
this.globalData._i18n = this.$i18n //这是原型链上的$i18n this.globalData._i18n = this.$i18n //这是原型链上的$i18n
this.globalData.$t = function(str) { this.globalData.$t = function(str) {
let $i18n = context.globalData.$i18n //这里去拿global的i18n let $i18n = context.globalData.$i18n //这里去拿global的i18n

186
manifest.json
View File

@ -1,6 +1,6 @@
{ {
"name" : "半径里商家端", "name" : "半径里商家端",
"appid" : "__UNI__F5A06B4", "appid" : "__UNI__F1A1D03",
"description" : "", "description" : "",
"versionName" : "1.2.3", "versionName" : "1.2.3",
"versionCode" : 103, "versionCode" : 103,
@ -69,9 +69,14 @@
"urlschemewhitelist" : "amapuri", "urlschemewhitelist" : "amapuri",
"validArchitectures" : [ "arm64" ], "validArchitectures" : [ "arm64" ],
"dSYMs" : false, "dSYMs" : false,
"idfa" : false "idfa" : false,
"frameworks" : [
// 原有框架保留，下面追加这一行
"libresolv.tbd"
]
}, },
"apple" : { "apple" : {
"frameworks" : [ "libresolv.tbd" ],
"urlschemewhitelist" : [ "iosamap", "baidumap", "qqmap" ] "urlschemewhitelist" : [ "iosamap", "baidumap", "qqmap" ]
}, },
/* SDK配置 */ /* SDK配置 */
@ -123,44 +128,44 @@
"xxxhdpi" : "unpackage/res/icons/192x192.png" "xxxhdpi" : "unpackage/res/icons/192x192.png"
}, },
"ios" : { "ios" : {
"appstore" : "unpackage/res/icons/1024x1024.png", "appstore" : "unpackage/res/icons/1024.png",
"ipad" : { "ipad" : {
"app" : "unpackage/res/icons/76x76.png", "app" : "unpackage/res/icons/76.png",
"app@2x" : "unpackage/res/icons/152x152.png", "app@2x" : "unpackage/res/icons/152.png",
"notification" : "unpackage/res/icons/20x20.png", "notification" : "unpackage/res/icons/58.png",
"notification@2x" : "unpackage/res/icons/40x40.png", "notification@2x" : "unpackage/res/icons/40.png",
"proapp@2x" : "unpackage/res/icons/167x167.png", "proapp@2x" : "unpackage/res/icons/167.png",
"settings" : "unpackage/res/icons/29x29.png", "settings" : "unpackage/res/icons/29.png",
"settings@2x" : "unpackage/res/icons/58x58.png", "settings@2x" : "unpackage/res/icons/58.png",
"spotlight" : "unpackage/res/icons/40x40.png", "spotlight" : "unpackage/res/icons/40.png",
"spotlight@2x" : "unpackage/res/icons/80x80.png" "spotlight@2x" : "unpackage/res/icons/80.png"
}, },
"iphone" : { "iphone" : {
"app@2x" : "unpackage/res/icons/120x120.png", "app@2x" : "unpackage/res/icons/120.png",
"app@3x" : "unpackage/res/icons/180x180.png", "app@3x" : "unpackage/res/icons/180.png",
"notification@2x" : "unpackage/res/icons/40x40.png", "notification@2x" : "unpackage/res/icons/40.png",
"notification@3x" : "unpackage/res/icons/60x60.png", "notification@3x" : "unpackage/res/icons/60.png",
"settings@2x" : "unpackage/res/icons/58x58.png", "settings@2x" : "unpackage/res/icons/58.png",
"settings@3x" : "unpackage/res/icons/87x87.png", "settings@3x" : "unpackage/res/icons/87.png",
"spotlight@2x" : "unpackage/res/icons/80x80.png", "spotlight@2x" : "unpackage/res/icons/80.png",
"spotlight@3x" : "unpackage/res/icons/120x120.png" "spotlight@3x" : "unpackage/res/icons/120.png"
} }
} }
} }
}, },
"nativePlugins" : { "nativePlugins" : {
"JG-JCore" : { "JG-JCore" : {
"JPUSH_APPKEY_ANDROID" : "", "JPUSH_APPKEY_ANDROID" : "9158867ba95e511877dfbf1d",
"JPUSH_APPKEY_IOS" : "", "JPUSH_APPKEY_IOS" : "9158867ba95e511877dfbf1d",
"JPUSH_CHANNEL_ANDROID" : "130f556e8473c9b558777fe3", "JPUSH_CHANNEL_ANDROID" : "9158867ba95e511877dfbf1d",
"JPUSH_CHANNEL_IOS" : "130f556e8473c9b558777fe3", "JPUSH_CHANNEL_IOS" : "9158867ba95e511877dfbf1d",
"__plugin_info__" : { "__plugin_info__" : {
"name" : "极光推送 JCore 官方 SDK", "name" : "极光推送 JCore 官方 SDK",
"description" : "极光推送 JCore 官方 SDK HBuilder 插件版本", "description" : "极光推送 JCore 官方 SDK HBuilder 插件版本",
"platforms" : "Android,iOS", "platforms" : "Android,iOS",
"url" : "https://ext.dcloud.net.cn/plugin?id=4028", "url" : "https://ext.dcloud.net.cn/plugin?id=4028",
"android_package_name" : "", "android_package_name" : "com.peisong",
"ios_bundle_id" : "", "ios_bundle_id" : "com.xenjoyou.banjingli",
"isCloud" : true, "isCloud" : true,
"bought" : 1, "bought" : 1,
"pid" : "4028", "pid" : "4028",
@ -187,135 +192,6 @@
} }
} }
} }
},
"JG-JPush" : {
"JPUSH_ADVERTISINGID_IOS" : "",
"JPUSH_DEFAULTINITJPUSH_IOS" : "",
"JPUSH_GOOGLE_API_KEY" : "",
"JPUSH_GOOGLE_APP_ID" : "",
"JPUSH_GOOGLE_PROJECT_ID" : "",
"JPUSH_GOOGLE_PROJECT_NUMBER" : "",
"JPUSH_GOOGLE_STORAGE_BUCKET" : "",
"JPUSH_HONOR_APPID" : "",
"JPUSH_HUAWEI_APPID" : "",
"JPUSH_ISPRODUCTION_IOS" : "",
"JPUSH_MEIZU_APPID" : "",
"JPUSH_MEIZU_APPKEY" : "",
"JPUSH_OPPO_APPID" : "",
"JPUSH_OPPO_APPKEY" : "",
"JPUSH_OPPO_APPSECRET" : "",
"JPUSH_VIVO_APPID" : "",
"JPUSH_VIVO_APPKEY" : "",
"JPUSH_XIAOMI_APPID" : "",
"JPUSH_XIAOMI_APPKEY" : "",
"__plugin_info__" : {
"name" : "极光推送 JPush 官方 SDK",
"description" : "极光推送JPush官方SDK HBuilder插件版本",
"platforms" : "Android,iOS",
"url" : "https://ext.dcloud.net.cn/plugin?id=4035",
"android_package_name" : "",
"ios_bundle_id" : "",
"isCloud" : true,
"bought" : 1,
"pid" : "4035",
"parameters" : {
"JPUSH_ADVERTISINGID_IOS" : {
"des" : "[iOS]广告标识符（IDFA）如果不需要使用IDFA，可不填",
"key" : "JPush:ADVERTISINGID",
"value" : ""
},
"JPUSH_DEFAULTINITJPUSH_IOS" : {
"des" : "[iOS]是否默认初始化，是填true，不是填false或者不填",
"key" : "JPush:DEFAULTINITJPUSH",
"value" : ""
},
"JPUSH_GOOGLE_API_KEY" : {
"des" : "厂商google api_key,示例:g-12346578",
"key" : "google_api_key",
"value" : ""
},
"JPUSH_GOOGLE_APP_ID" : {
"des" : "厂商google mobilesdk_app_id,示例：g-12346578",
"key" : "google_app_id",
"value" : ""
},
"JPUSH_GOOGLE_PROJECT_ID" : {
"des" : "厂商google project_id ,示例：g-12346578",
"key" : "project_id",
"value" : ""
},
"JPUSH_GOOGLE_PROJECT_NUMBER" : {
"des" : "厂商google project_number,示例：g-12346578",
"key" : "gcm_defaultSenderId",
"value" : ""
},
"JPUSH_GOOGLE_STORAGE_BUCKET" : {
"des" : "厂商google storage_bucket,示例：g-12346578",
"key" : "google_storage_bucket",
"value" : ""
},
"JPUSH_HONOR_APPID" : {
"des" : "厂商HONOR-appId,示例：12346578",
"key" : "com.hihonor.push.app_id",
"value" : ""
},
"JPUSH_HUAWEI_APPID" : {
"des" : "厂商HUAWEI-appId,示例：appid=12346578",
"key" : "com.huawei.hms.client.appid",
"value" : ""
},
"JPUSH_ISPRODUCTION_IOS" : {
"des" : "[iOS]是否是生产环境，是填true，不是填false或者不填",
"key" : "JPush:ISPRODUCTION",
"value" : ""
},
"JPUSH_MEIZU_APPID" : {
"des" : "厂商MEIZU-appId,示例：MZ-12345678",
"key" : "MEIZU_APPID",
"value" : ""
},
"JPUSH_MEIZU_APPKEY" : {
"des" : "厂商MEIZU-appKey,示例：MZ-12345678",
"key" : "MEIZU_APPKEY",
"value" : ""
},
"JPUSH_OPPO_APPID" : {
"des" : "厂商OPPO-appId,示例：OP-12345678",
"key" : "OPPO_APPID",
"value" : ""
},
"JPUSH_OPPO_APPKEY" : {
"des" : "厂商OPPO-appkey,示例：OP-12345678",
"key" : "OPPO_APPKEY",
"value" : ""
},
"JPUSH_OPPO_APPSECRET" : {
"des" : "厂商OPPO-appSecret,示例：OP-12345678",
"key" : "OPPO_APPSECRET",
"value" : ""
},
"JPUSH_VIVO_APPID" : {
"des" : "厂商VIVO-appId,示例：12345678",
"key" : "com.vivo.push.app_id",
"value" : ""
},
"JPUSH_VIVO_APPKEY" : {
"des" : "厂商VIVO-appkey,示例：12345678",
"key" : "com.vivo.push.api_key",
"value" : ""
},
"JPUSH_XIAOMI_APPID" : {
"des" : "厂商XIAOMI-appId,示例：MI-12345678",
"key" : "XIAOMI_APPID",
"value" : ""
},
"JPUSH_XIAOMI_APPKEY" : {
"des" : "厂商XIAOMI-appKey,示例：MI-12345678",
"key" : "XIAOMI_APPKEY",
"value" : ""
}
}
}
} }
} }
}, },

6
pages/login/login.vue
View File

@ -36,9 +36,9 @@
</view> </view>
</block> </block>
<view class="small-btn"> <view class="small-btn">
<view class="reg-btn" @click="loginType = !loginType"> <!-- <view class="reg-btn" @click="loginType = !loginType">
切换登录方式 切换登录方式
</view> </view> -->
<!-- <navigator v-if="loginType == false" class="forget-pass" url="/pages/login/regist?type=3"> <!-- <navigator v-if="loginType == false" class="forget-pass" url="/pages/login/regist?type=3">
{{i18n.login.forgetPass}} {{i18n.login.forgetPass}}
</navigator> --> </navigator> -->
@ -75,7 +75,7 @@
wayValue:0, wayValue:0,
captchaImg:'', captchaImg:'',
top: 0, top: 0,
loginType: false, loginType: true,
codetimes: '获取验证码', codetimes: '获取验证码',
timer: null, timer: null,
canshowcode: false, canshowcode: false,

2
pages/shop/orderDetail.vue
View File

@ -249,7 +249,7 @@
this.NB.sendRequest("/mall/order/detail/"+ this.shopId, {}, false, 'get', 'application/json').then((res) => { this.NB.sendRequest("/mall/order/detail/"+ this.shopId, {}, false, 'get', 'application/json').then((res) => {
if (res.code == 200) { if (res.code == 200) {
that.data = res.result that.data = res.result
console.log('缓存shopTakeaway',uni.getStorageSync('shopTakeaway'))
//商家预计收入的计算1 //商家预计收入的计算1
let price = that.data.goodsAmount+that.data.packageFee let price = that.data.goodsAmount+that.data.packageFee
if(that.data.orderType == 1){ if(that.data.orderType == 1){

13
pages/shop/shopEvaluate.vue
View File

@ -28,9 +28,7 @@
<view :style="{'width':index == 0?'160rpx':'180rpx'}" style="text-align: left;"> <view :style="{'width':index == 0?'160rpx':'180rpx'}" style="text-align: left;">
{{item.name}} {{item.num}} {{item.name}} {{item.num}}
</view> </view>
<img v-if="item.checked" class="checked-img" <img v-if="item.checked" class="checked-img" src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/4bb5fc7725cb4a7a84d1d3a15f05b39c.png" alt="" />
src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/4bb5fc7725cb4a7a84d1d3a15f05b39c.png"
alt="" />
</view> </view>
</view> </view>
</view> </view>
@ -38,8 +36,7 @@
<view v-for="(item,index) in shopComments" :key="index"> <view v-for="(item,index) in shopComments" :key="index">
<view class="eval-title"> <view class="eval-title">
<view class="eval-icon"> <view class="eval-icon">
<img :src="item.createByIcon" <img :src="item.createByIcon" alt="" />
alt="" />
</view> </view>
<view class="eval-name"> <view class="eval-name">
<view class="name1"> <view class="name1">
@ -87,13 +84,11 @@
<textarea name="" v-model="replyText" id="" cols="30" rows="10" placeholder="有什么想说的吗？可以写下来，提交给我们" style="width: 100%;font-size: 28rpx;padding: 30rpx;height: 200rpx;"></textarea> <textarea name="" v-model="replyText" id="" cols="30" rows="10" placeholder="有什么想说的吗？可以写下来，提交给我们" style="width: 100%;font-size: 28rpx;padding: 30rpx;height: 200rpx;"></textarea>
</view> </view>
<view class="eval-num" style="border: none;padding: 0 30rpx;display: flex;margin-bottom: 10px;"> <view class="eval-num" style="border: none;padding: 0 30rpx;display: flex;margin-bottom: 10px;">
<view class="upload-img" @tap="pictureAdd()" <view class="upload-img" @tap="pictureAdd()" style="background: #eee;text-align: center;line-height: 160rpx;">
style="background: #eee;text-align: center;line-height: 160rpx;">
<uni-icons type="camera" size="28" color="#777"></uni-icons> <uni-icons type="camera" size="28" color="#777"></uni-icons>
</view> </view>
<view style="flex: 1;display: flex;"> <view style="flex: 1;display: flex;">
<view v-if="replyPicture !=''" <view v-if="replyPicture !=''" :key="index" style="width: 160rpx;height: 160rpx;margin-left: 20rpx;">
:key="index" style="width: 160rpx;height: 160rpx;margin-left: 20rpx;">
<img :src="replyPicture" alt="" class="upload-img"> <img :src="replyPicture" alt="" class="upload-img">
</view> </view>
</view> </view>

Write Preview
Loading…
Cancel
Save