Skip to content

L
lumastoreapp
Commit f054969f authored by haitao's avatar haitao
Browse files
Options

asd

parent 53048dd1
Hide whitespace changes
Inline Side-by-side
Showing with 67 additions and 156 deletions
App.vue
View file @ f054969f
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
console.log('getDeviceInfo failed: '+JSON.stringify(e)); console.log('getDeviceInfo failed: '+JSON.stringify(e));
} }
}); });
// #endif // #endif
//安卓的 //安卓的
......
components/yomol-upgrade/yomol-upgrade.vue
View file @ f054969f
...@@ -124,20 +124,16 @@ ...@@ -124,20 +124,16 @@
}, },
onSureClick(){ onSureClick(){
var platform = uni.getSystemInfoSync().platform var platform = uni.getSystemInfoSync().platform
if( this.type == 'pkg' && platform != 'ios'){//platform == 'ios' && this.type == 'pkg' if(platform == 'ios'){
plus.runtime.openURL(this.url);
}else if(this.type == 'pkg' && platform == 'ios'){
////处理IOS升级 直接打开对应的地址 ////处理IOS升级 直接打开对应的地址
//ios 不做在线升级 //ios 不做在线升级
} }else{
else{
//处理安卓的 //处理安卓的
this.downloading = true this.downloading = true
console.log(this.url)
var downloadTask = uni.downloadFile({ var downloadTask = uni.downloadFile({
url: this.url, url: this.url,
success: (downloadResult) => { success: (downloadResult) => {
console.log(downloadResult);
this.hide() this.hide()
if (downloadResult.statusCode === 200) { if (downloadResult.statusCode === 200) {
plus.runtime.install(downloadResult.tempFilePath, { plus.runtime.install(downloadResult.tempFilePath, {
...@@ -167,7 +163,6 @@ ...@@ -167,7 +163,6 @@
//直接不直接 苹果不做更新 //直接不直接 苹果不做更新
if(uni.getSystemInfoSync().platform == 'ios'){ if(uni.getSystemInfoSync().platform == 'ios'){
console.info("ios更新检测,不进入~");
return false; return false;
} }
...@@ -199,7 +194,6 @@ ...@@ -199,7 +194,6 @@
user_token:this.$store.state.token, user_token:this.$store.state.token,
}, },
success: (result) => { success: (result) => {
console.log(result,"result"); console.log(result,"result");
var str = widgetInfo.version; var str = widgetInfo.version;
var str1 = ""; var str1 = "";
...@@ -221,11 +215,8 @@ ...@@ -221,11 +215,8 @@
let appVersion = parseFloat(str1);//当前版本 let appVersion = parseFloat(str1);//当前版本
let nesVersion = parseFloat(result.data.data.version);//最新版本 let nesVersion = parseFloat(result.data.data.version);//最新版本
console.log(appVersion,nesVersion)
if (nesVersion > appVersion) { if (nesVersion > appVersion) {
// result.data.Version
//DownloadUrl 是 wgt的
// pkgUrl 是 pkg 的 也就是跳转下载的
if (result.data.data.pkgurl != '' && result.data.data.downloadurl == '') { if (result.data.data.pkgurl != '' && result.data.data.downloadurl == '') {
......
manifest.json
View file @ f054969f
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
//"appid" : "__UNI__FC9419E", //"appid" : "__UNI__FC9419E",
"appid" : "__UNI__1EA80F1", //这个是 web 的 "appid" : "__UNI__1EA80F1", //这个是 web 的
"description" : "", "description" : "",
"versionName" : "1.0.68", "versionName" : "1.0.73",
"versionCode" : 168, "versionCode" : 173,
"transformPx" : false, "transformPx" : false,
/* 5+App特有相关 */ /* 5+App特有相关 */
"app-plus" : { "app-plus" : {
...@@ -69,9 +69,9 @@ ...@@ -69,9 +69,9 @@
/* SDK配置 */ /* SDK配置 */
"sdkConfigs" : { "sdkConfigs" : {
"maps" : { "maps" : {
"baidu" : { "amap" : {
"appkey_ios" : "QuknQN8dKc98xIYYUIacfDrmGjbjW4Z1", "appkey_ios" : "62e2201518c26e1838d0f2cde6c23074",
"appkey_android" : "QuknQN8dKc98xIYYUIacfDrmGjbjW4Z1" "appkey_android" : "44bff421525c5efb1a416a619fc11d05"
} }
}, },
"ad" : {}, "ad" : {},
...@@ -113,37 +113,38 @@ ...@@ -113,37 +113,38 @@
}, },
"splashscreen" : { "splashscreen" : {
"android" : { "android" : {
"hdpi" : "F:/证书/d0abce82961b508e6a0b9924d15fe86.png", "hdpi" : "C:/Users/Administrator/Desktop/证书/d0abce82961b508e6a0b9924d15fe86.png",
"xhdpi" : "F:/证书/d0abce82961b508e6a0b9924d15fe86.png", "xhdpi" : "C:/Users/Administrator/Desktop/证书/d0abce82961b508e6a0b9924d15fe86.png",
"xxhdpi" : "F:/证书/d0abce82961b508e6a0b9924d15fe86.png" "xxhdpi" : "C:/Users/Administrator/Desktop/证书/d0abce82961b508e6a0b9924d15fe86.png"
}, },
"ios" : { "ios" : {
"iphone" : { "iphone" : {
"portrait-896h@3x" : "F:/证书/d0abce82961b508e6a0b9924d15fe86.png", "portrait-896h@3x" : "C:/Users/Administrator/Desktop/证书/d0abce82961b508e6a0b9924d15fe86.png",
"landscape-896h@3x" : "F:/证书/d0abce82961b508e6a0b9924d15fe86.png", "landscape-896h@3x" : "C:/Users/Administrator/Desktop/证书/d0abce82961b508e6a0b9924d15fe86.png",
"portrait-896h@2x" : "F:/证书/d0abce82961b508e6a0b9924d15fe86.png", "portrait-896h@2x" : "C:/Users/Administrator/Desktop/证书/d0abce82961b508e6a0b9924d15fe86.png",
"landscape-896h@2x" : "F:/证书/d0abce82961b508e6a0b9924d15fe86.png", "landscape-896h@2x" : "C:/Users/Administrator/Desktop/证书/d0abce82961b508e6a0b9924d15fe86.png",
"iphonex" : "F:/证书/d0abce82961b508e6a0b9924d15fe86.png", "iphonex" : "C:/Users/Administrator/Desktop/证书/d0abce82961b508e6a0b9924d15fe86.png",
"iphonexl" : "F:/证书/d0abce82961b508e6a0b9924d15fe86.png", "iphonexl" : "C:/Users/Administrator/Desktop/证书/d0abce82961b508e6a0b9924d15fe86.png",
"retina55" : "F:/证书/d0abce82961b508e6a0b9924d15fe86.png", "retina55" : "C:/Users/Administrator/Desktop/证书/d0abce82961b508e6a0b9924d15fe86.png",
"retina55l" : "F:/证书/d0abce82961b508e6a0b9924d15fe86.png", "retina55l" : "C:/Users/Administrator/Desktop/证书/d0abce82961b508e6a0b9924d15fe86.png",
"retina47" : "F:/证书/d0abce82961b508e6a0b9924d15fe86.png", "retina47" : "C:/Users/Administrator/Desktop/证书/d0abce82961b508e6a0b9924d15fe86.png",
"retina47l" : "F:/证书/d0abce82961b508e6a0b9924d15fe86.png", "retina47l" : "C:/Users/Administrator/Desktop/证书/d0abce82961b508e6a0b9924d15fe86.png",
"retina40" : "F:/证书/d0abce82961b508e6a0b9924d15fe86.png", "retina40" : "C:/Users/Administrator/Desktop/证书/d0abce82961b508e6a0b9924d15fe86.png",
"retina40l" : "F:/证书/d0abce82961b508e6a0b9924d15fe86.png", "retina40l" : "C:/Users/Administrator/Desktop/证书/d0abce82961b508e6a0b9924d15fe86.png",
"retina35" : "F:/证书/d0abce82961b508e6a0b9924d15fe86.png" "retina35" : "C:/Users/Administrator/Desktop/证书/d0abce82961b508e6a0b9924d15fe86.png"
}, },
"ipad" : { "ipad" : {
"portrait-1366h@2x" : "F:/证书/d0abce82961b508e6a0b9924d15fe86.png", "portrait-1366h@2x" : "C:/Users/Administrator/Desktop/证书/d0abce82961b508e6a0b9924d15fe86.png",
"landscape-1366h@2x" : "F:/证书/d0abce82961b508e6a0b9924d15fe86.png", "landscape-1366h@2x" : "C:/Users/Administrator/Desktop/证书/d0abce82961b508e6a0b9924d15fe86.png",
"portrait-1194h@2" : "F:/证书/d0abce82961b508e6a0b9924d15fe86.png", "portrait-1194h@2" : "F:/证书/d0abce82961b508e6a0b9924d15fe86.png",
"landscape-1194h@2x" : "F:/证书/d0abce82961b508e6a0b9924d15fe86.png", "landscape-1194h@2x" : "C:/Users/Administrator/Desktop/证书/d0abce82961b508e6a0b9924d15fe86.png",
"portrait-1112h@2x" : "F:/证书/d0abce82961b508e6a0b9924d15fe86.png", "portrait-1112h@2x" : "C:/Users/Administrator/Desktop/证书/d0abce82961b508e6a0b9924d15fe86.png",
"landscape-1112h@2x" : "F:/证书/d0abce82961b508e6a0b9924d15fe86.png", "landscape-1112h@2x" : "C:/Users/Administrator/Desktop/证书/d0abce82961b508e6a0b9924d15fe86.png",
"portrait-retina7" : "F:/证书/d0abce82961b508e6a0b9924d15fe86.png", "portrait-retina7" : "C:/Users/Administrator/Desktop/证书/d0abce82961b508e6a0b9924d15fe86.png",
"landscape-retina7" : "F:/证书/d0abce82961b508e6a0b9924d15fe86.png", "landscape-retina7" : "C:/Users/Administrator/Desktop/证书/d0abce82961b508e6a0b9924d15fe86.png",
"portrait7" : "F:/证书/d0abce82961b508e6a0b9924d15fe86.png", "portrait7" : "C:/Users/Administrator/Desktop/证书/d0abce82961b508e6a0b9924d15fe86.png",
"landscape7" : "F:/证书/d0abce82961b508e6a0b9924d15fe86.png" "landscape7" : "C:/Users/Administrator/Desktop/证书/d0abce82961b508e6a0b9924d15fe86.png",
"portrait-1194h@2x" : "C:/Users/Administrator/Desktop/证书/d0abce82961b508e6a0b9924d15fe86.png"
} }
} }
} }
......
pages/edit/shop/shop.vue
View file @ f054969f
...@@ -17,34 +17,25 @@ ...@@ -17,34 +17,25 @@
<view class="title">店铺电话：</view> <view class="title">店铺电话：</view>
<input class="title" style="flex-grow: 1;" placeholder="请输入店铺电话" disabled="disabled" v-model="fromdata.tel"></input> <input class="title" style="flex-grow: 1;" placeholder="请输入店铺电话" disabled="disabled" v-model="fromdata.tel"></input>
</view> </view>
<view class="cu-form-group "> <view class="cu-form-group " @tap="chooseLocation">
<view class="title">店铺地址：</view> <view class="title">店铺地址：</view>
<input class="title" style="flex-grow: 1;" placeholder="请输入店铺地址" disabled="disabled" v-model="fromdata.addr"></input> <view class="flex1 jus-b ali-c">
<input class="title" style="flex-grow: 1;" placeholder="请输入店铺地址" disabled="disabled" v-model="fromdata.addr"></input>
<view class="" style="color: #FF6900;border:1px solid #FF6900;font-size:20upx;padding: 0 5upx;">修改地址</view>
</view>
</view> </view>
<!-- @click="biaozu" -->
<!-- <view class="cu-form-group" >
<view class="title">标注位置：</view>
<input :placeholder="address" name="input" disabled></input>
<text v-if="!address" class='cuIcon-locationfill text-orange'></text>
</view> -->
<view class="cu-form-group flex" style="padding: 30upx;"> <view class="cu-form-group flex" style="padding: 30upx;">
<view class="title">营业时间：</view> <view class="title">营业时间：</view>
<view class="time flex"> <view class="time flex">
<view class="biao_05_2"> <view class="biao_05_2">
<view class="uni-list-cell-db flex"> <view class="uni-list-cell-db flex">
<!-- @change="bindTimeChange" --> <view class="" style="color:rgb(84, 84, 84);font-size: 32upx;">{{time}}</view>
<!-- <picker mode="time" :value="time" style="margin-top: 6px;"> -->
<view class="uni-input">{{time}}</view>
<!-- </picker> -->
</view> </view>
</view> </view>
<view class="biao_05_2 flex" style="margin: 0 0 0 10px;">--</view> <view class="biao_05_2 flex" style="margin: 0 20upx 0 20upx;">--</view>
<view class="uni-list-cell-db flex"> <view class="uni-list-cell-db flex">
<!-- @change="bindTimeChange_close" --> <view class="" style="color:rgb(84, 84, 84);font-size: 32upx;">{{time_close}}</view>
<!-- <picker mode="time" :value="time_close" style="margin-top: 6px;"> -->
<view class="uni-input">{{time_close}}</view>
<!-- </picker> -->
</view> </view>
</view> </view>
</view> </view>
...@@ -80,10 +71,7 @@ ...@@ -80,10 +71,7 @@
import wPicker from "@/components/w-picker/w-picker.vue"; import wPicker from "@/components/w-picker/w-picker.vue";
import graceRichText from "@/utils/richText.js"; import graceRichText from "@/utils/richText.js";
import config from "@/utils/config.js"; import config from "@/utils/config.js";
import { import {addNewStore,shopDetail} from "@/utils/api/api.js";
addNewStore,
shopDetail
} from "@/utils/api/api.js";
import QQMapWX from "@/utils/libs/qqmap-wx-jssdk.min.js"; import QQMapWX from "@/utils/libs/qqmap-wx-jssdk.min.js";
var qqmapsdk = new QQMapWX({ var qqmapsdk = new QQMapWX({
...@@ -113,8 +101,6 @@ ...@@ -113,8 +101,6 @@
business_time: "", //时间 business_time: "", //时间
logo: "", //店铺logo logo: "", //店铺logo
// city_code: "",//城市代码
// area_code: "",//区号
}, },
...@@ -176,15 +162,11 @@ ...@@ -176,15 +162,11 @@
this.fromdata.tel = this.shopinfos.tel; this.fromdata.tel = this.shopinfos.tel;
this.fromdata.lat = this.shopinfos.lat; this.fromdata.lat = this.shopinfos.lat;
this.fromdata.lng = this.shopinfos.lng; this.fromdata.lng = this.shopinfos.lng;
// this.fromdata.details = this.shopinfos.details;
this.fromdata.details = graceRichText.format(this.shopinfos.details); this.fromdata.details = graceRichText.format(this.shopinfos.details);
this.fromdata.addr = this.shopinfos.addr; this.fromdata.addr = this.shopinfos.addr;
this.fromdata.business_time = this.shopinfos.business_time; //营业时间 需要特殊处理 this.fromdata.business_time = this.shopinfos.business_time; //营业时间 需要特殊处理
this.fromdata.logo = this.shopinfos.logo; this.fromdata.logo = this.shopinfos.logo;
//console.info(this.fromdata.business_time.split("---"),"business_time");
if (this.fromdata.business_time.indexOf("---") != -1) { if (this.fromdata.business_time.indexOf("---") != -1) {
let timearr = this.fromdata.business_time.split("---"); let timearr = this.fromdata.business_time.split("---");
if (timearr.length != 0) { if (timearr.length != 0) {
...@@ -231,30 +213,7 @@ ...@@ -231,30 +213,7 @@
} }
}); });
}, },
//提交修改
async addNewStoreFun() {
this.fromdata.business_time = this.time + "---" + this.time_close; //营业时间
// console.info(this.fromdata);
// return false;
let objs = { ...this.shopinfos,
...this.fromdata
};
let res = await addNewStore(this.fromdata); //this.fromdata
if (res.code == 0) {
this.$api.msg(res.msg);
} else {
this.$api.msg(res.msg);
}
// else if(res.code==-1){
// this.$api.msg("暂时不允许修改");
// }
},
textareaAInput(e) { textareaAInput(e) {
}, },
...@@ -280,75 +239,36 @@ ...@@ -280,75 +239,36 @@
this.list.shop_state = false // 0 this.list.shop_state = false // 0
} }
}, },
//选择位置
biaozu() {
const that = this
//微信
//#ifdef MP-WEIXIN
uni.getSetting({
success(res) {
if (!res.authSetting['scope.userLocation']) {
uni.authorize({
scope: 'scope.userLocation',
success() {
that.chooseLocation()
return;
}
})
} else {
that.chooseLocation()
return;
}
}
})
//#endif
//不是微信
//#ifndef MP-WEIXIN
that.chooseLocation()
//#endif
},
//选中定位 获取经纬度 //选中定位 获取经纬度
chooseLocation() { chooseLocation() {
const that = this
uni.chooseLocation({ uni.chooseLocation({
success: (res) => { success: (data) => {
that.address = res.name //console.log(data)
that.list.position = res
this.fromdata.lat = res.latitude;
this.fromdata.lng = res.longitude;
console.info(res);
qqmapsdk.reverseGeocoder({ qqmapsdk.reverseGeocoder({
location: { location: {
latitude: res.latitude, latitude: data.latitude,
longitude: res.longitude longitude: data.longitude
}, },
success: (restwo) => { success: (res)=>{
//debugger this.fromdata.lat = res.result.location.lat;
//console.log(res) this.fromdata.lng = res.result.location.lng;
let province = res.result.ad_info.province; this.fromdata.addr = res.result.address+res.result.formatted_addresses.rough;
let city = res.result.ad_info.city;
//console.log(res,"res"); addNewStore(this.fromdata).then(res=>{ //修改商家信息
// this.province=Number(res.result.ad_info.adcode)-Number(res.result.ad_info.adcode)%1000;//省级ID if (res.code == 0) {
// this.citys=Number(res.result.ad_info.adcode)-Number(res.result.ad_info.adcode)%100;//市级ID this.$api.msg(res.msg);
// this.countys=Number(res.result.ad_info.adcode);//区县级ID } else {
this.$api.msg(res.msg);
// this.fromdata.city_code=Number(res.result.ad_info.adcode)-Number(res.result.ad_info.adcode)%100;//城市代码 }
// this.fromdata.area_code=Number(res.result.ad_info.adcode);//区号 });
//console.info(restwo); console.log(this.fromdata.addr,"res");
}, },
fail: (err) => { fail: (err)=>{
console.log(err) console.log(err)
} }
}) })
} }
}); });
}, },
......
utils/debug.js
View file @ f054969f
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
//环境变量 这个是 鹿马商家助手的 商家助手的~~~~ //环境变量 这个是 鹿马商家助手的 商家助手的~~~~
module.exports = { module.exports = {
//是否为开发调试环境 true为本地环境 false 为正式环境 //是否为开发调试环境 true为本地环境 false 为正式环境
isdebug:true,//测试 //isdebug:true,//测试
// isdebug:false,//正式 isdebug:false,//正式
xqdebug:false,//正式权限 xqdebug:false,//正式权限
// xqdebug:true,//发布审核权限 也是测试环境的 主要用于ios // xqdebug:true,//发布审核权限 也是测试环境的 主要用于ios
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment