Skip to content

L
lumastoreapp
Commit 366275ce authored by home's avatar home
Browse files
Options

zxf

parent 1c237a53
Hide whitespace changes
Inline Side-by-side
Showing with 105 additions and 63 deletions
App.vue
View file @ 366275ce
......@@ -55,58 +55,58 @@
}
},
methods:{
// hgServiceFun(){
// const hgService = uni.requireNativePlugin("HG-Background"); //初始化
// hgService.config({
// title:"鹿马商家助手",
// content:"小鹿正在为您进行实时播报...",
// mode: 1, //0省电模式 1流氓模式
// });
hgServiceFun(){
const hgService = uni.requireNativePlugin("HG-Background"); //初始化
hgService.config({
title:"鹿马商家助手",
content:"小鹿正在为您进行实时播报...",
mode: 1, //0省电模式 1流氓模式
});
// var rsult=hgService.checkIfLimited(); //检测是否限制后台运行
var rsult=hgService.checkIfLimited(); //检测是否限制后台运行
// if(rsult.isLimit){ //限制了后台运行
// hgService.requestIgnoreLimit(); //申请
if(rsult.isLimit){ //限制了后台运行
hgService.requestIgnoreLimit(); //申请
// }
// // console.log('没有限制');
// hgService.startService(); //启动前台服务
// // hgService.showSafeSetting();//打开安全管理 支持小米，华为，锤子，opp,vivo,三星，乐视，魅族
}
// console.log('没有限制');
hgService.startService(); //启动前台服务
// hgService.showSafeSetting();//打开安全管理 支持小米，华为，锤子，opp,vivo,三星，乐视，魅族
// //var globalEvent = uni.requireNativePlugin('globalEvent'); //全局事件回调 任务启动时间，会有一定延时 一般一分钟内。
// },
//var globalEvent = uni.requireNativePlugin('globalEvent'); //全局事件回调 任务启动时间，会有一定延时 一般一分钟内。
},
hgServiceFun(){
const pushLive = uni.requireNativePlugin('push-live');
pushLive.startService({ //启动服务
title: "鹿马商家助手",
content: "小鹿正在为您进行实时播报...",
mode: 1 //0省电模式 1流氓模式
}, function(res) {
console.log(res)
});
// hgServiceFun(){
// const pushLive = uni.requireNativePlugin('push-live');
// pushLive.startService({ //启动服务
// title: "鹿马商家助手",
// content: "小鹿正在为您进行实时播报...",
// mode: 1 //0省电模式 1流氓模式
// }, function(res) {
// console.log(res)
// });
pushLive.isIgnoringBatteryOptimizations(function(res) { //是否添加到白名单中
// pushLive.isIgnoringBatteryOptimizations(function(res) { //是否添加到白名单中
if(res.flag){ //添加进去了
//pushLive.gotoWhiteListSetting();
}else{
pushLive.requestIgnoreBatteryOptimizations(); //申请加入白名单
// if(res.flag){ //添加进去了
// //pushLive.gotoWhiteListSetting();
// }else{
// pushLive.requestIgnoreBatteryOptimizations(); //申请加入白名单
}
})
// }
// })
var globalEvent = uni.requireNativePlugin('globalEvent');
globalEvent.addEventListener('doJobEvent', function() {
console.log("我被定时启动了。。。。。。。。。。。。。。。。。")
});
// var globalEvent = uni.requireNativePlugin('globalEvent');
// globalEvent.addEventListener('doJobEvent', function() {
// console.log("我被定时启动了。。。。。。。。。。。。。。。。。")
// });
console.log(globalEvent)
// console.log(globalEvent)
},
// },
//获取 语音消息
......
components/orderItemss/orderItemss.vue
View file @ 366275ce
......@@ -16,6 +16,9 @@
</view>
<view class="time">{{dataorder.create_time}}</view>
</view>
</view>
<view class="beizhu flex jus-b ali-c" style="border-bottom: 1px solid #f1f1f1;">
<text class="price">{{dataorder.username_tel}}</text>
</view>
<!-- 上面的是 -->
<!-- reorder -->
......@@ -23,7 +26,8 @@
<view class="beizhu flex jus-b ali-c">
<text class="beizhutext oneline flex1" v-if="dataorder.remark">备注：{{dataorder.remark||''}}</text>
<text class="beizhutext oneline flex1" v-if="dataorder.message">退款原因：{{dataorder.message||''}}</text>
<text class="price">合计：¥{{dataorder.total}}</text>
<text class="price">合计：¥{{dataorder.total}}</text>
</view>
<view class="orderItemss_foot jus-b">
<view class="titmeboxs ali-c" >
......
manifest.json
View file @ 366275ce
......@@ -3,8 +3,8 @@
//"appid" : "__UNI__FC9419E",
"appid" : "__UNI__1EA80F1", //这个是 web 的
"description" : "商家",
"versionName" : "1.0.93",
"versionCode" : 193,
"versionName" : "1.0.95",
"versionCode" : 195,
"transformPx" : false,
"compatible" : {
"ignoreVersion" : true, //true表示忽略版本检查提示框，HBuilderX1.9.0及以上版本支持
......@@ -165,17 +165,17 @@
},
"compilerVersion" : 2,
"nativePlugins" : {
"push-live" : {
"HG-Background" : {
"__plugin_info__" : {
"name" : "安卓保活插件（限制 防杀）新增定时器方案 - [试用版，仅用于自定义调试基座]",
"description" : "如果你的应用希望能够一直在后台运行而不被系统自动杀死的话，可以尝试一下。群485147231",
"name" : "保活 前台运行",
"description" : "用于提高app存活概率或添加前台显示 q群：219508489",
"platforms" : "Android",
"url" : "https://ext.dcloud.net.cn/plugin?id=2930",
"android_package_name" : "",
"url" : "https://ext.dcloud.net.cn/plugin?id=2203",
"android_package_name" : "com.app.lumastore",
"ios_bundle_id" : "",
"isCloud" : true,
"bought" : 0,
"pid" : "2930",
"bought" : 1,
"pid" : "2203",
"parameters" : {}
}
}
......
pages/addEditEleProduct/addEditEleProduct.vue
View file @ 366275ce
......@@ -74,6 +74,23 @@
</view>
</view> -->
<view class="noecellbox">
<view class="title">必选品或非必选</view>
<view class="inputbox flex">
<radio-group @change="mandatoryradioChange">
<view class="chindlost ali-c flex flex-wrap" >
<view class="" v-for="(item, index) in mandatoryType" :key="item.value">
<label class="lableitem flex ali-c" style="margin-right: 40upx;">
<view >
<radio color="#FF6900" :value="item.value" :checked="item.value == form.mandatory" />
</view>
<view class="titles">{{item.name}}</view>
</label>
</view>
</view>
</radio-group>
</view>
</view>
<view class="noecellbox" v-if="isadd==1">
<view class="title">商品库存(库存剩余{{form.stock}})</view>
......@@ -327,6 +344,17 @@
name: '计重（kg）',
checked:'2'
}],
mandatoryType: [{
value: '1',
name: '必选品',
checked:'1'
}, {
value: '2',
name: '非必选',
checked:'2'
}],
storeNumber: [{
value: '1',
name: '增加库存',
......@@ -345,7 +373,7 @@
name: 'product',
result:[],
form: {
mandatory:'2',
linkage_id:'',
//cost_price 成本价 stock 商品库存purchase 进货价钱code 条形编码commission 返佣比例original_name 原始商品名
specifications:'',//商品规格
......@@ -443,7 +471,7 @@
}
}
console.log(this.classData[1])
// console.log(this.classData[1])
}
})
......@@ -680,6 +708,10 @@
this.form.sell_type = e.detail.value
console.log(this.form.sell_type)
},
mandatoryradioChange(e){
this.form.mandatory = e.detail.value
console.log(this.form.mandatory)
},
radioChanges(e){
......@@ -769,7 +801,7 @@
this.form.sell_type = res.data.sell_type, // 售卖类型
// this.form.commodity_data:{}, //原始商品名
// 2020-10-22 添加字段
this.form.mandatory = res.data.mandatory
......@@ -792,7 +824,7 @@
}
})
}else if(res.data.commodity_type == 'weigh'){
console.log(res.data.commodity_type,585555555555555555555555)
// console.log(res.data.commodity_type,585555555555555555555555)
this.weigh.map(item=>{
if(this.linkage_product_id == item.product_id){
......@@ -861,11 +893,10 @@
// if(this.c_pics.length == 0){
// this.$api.msg('产品图片未上传');
// }
//
let can = {
linkage_id:this.linkage_id,
mandatory:this.form.mandatory,
gram:this.form.specifications, //商品规格
quality_guarantee_period : this.qualitYears*365+this.qualityMonths*30+this.qualityDays*1, //保质期（月）
manufacture_date :this.form.manufacture_date, //生产日期
......@@ -883,7 +914,7 @@
action:this.form.action,//方式（添加：add，修改:edit）
price:this.form.price,//价格
cate_id:this.form.cate_id,
photo:this.c_pics[0].data, //图片
photo: this.c_pics.length == 0?'': this.c_pics[0].data, //图片
activity_price:this.form.activity_price,//秒杀价
store_count:this.form.store_count ,//秒杀库存
activity_id:this.form.activity_id,//秒杀时间id
......
pages/eleProduct/eleProduct.vue
View file @ 366275ce
......@@ -230,7 +230,7 @@
onShow() {
// console.log(this.$refs.popup)
this.goods_list = [];
this.page = 0;
this.page = 1;
this.isallshow=false;
// this.goods_product_list();
this.searchProduct();
......
pages/order/detail/detail.vue
View file @ 366275ce
......@@ -23,7 +23,7 @@
</view>
</view>
<view class="" v-if="products.length!=0">
<view class='tag-e' v-if="products[0].productname!='快捷支付'" style="height: 200upx;">
<view class='tag-e' v-if="products[0].productname!='快捷支付'" >
<view class="goods " v-for="(item,index) of products" :key="index">
<image class="img" :src="staticUrl+item.photo" mode=""></image>
......@@ -38,14 +38,18 @@
</view>
</view>
</view>
</view>
</view>
<view class='tag-e' v-else>
<view class="goods ">
<view class='goods_title'>快捷支付</view>
</view>
</view>
</view>
<view class="total">总计：¥ {{detail.total}}</view>
</view>
</view>
<view class="total">总计：¥ {{detail.total}}</view>
<view class="mess">
<view class="mess_01">订单信息</view>
<view class="mess_02">
......
pages/order/shopOrder.vue
View file @ 366275ce
......@@ -56,8 +56,11 @@
</block>
</view>
</view>
</view>
<view class="order_foot flex jus-e mb-20 " >
<view class="heji"><text class="fuhao">{{item.username_tel}}</text></view>
</view>
<view class="pricebox flex ali-c jus-b">
<view class="pricebox flex ali-c jus-b" style="margin-top: 20upx;">
<!-- 剩余时间 只有待支付的时候有 未付款的时候才有 -->
<view class="titme oneline flex1" v-if="item.status==4">退款原因:{{item.refund_details}}</view>
<view v-else></view>
......
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