Commit 623fb1ad authored by xieyishang's avatar xieyishang

‘addxx

parent 2a55c8f6
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
content: "鹿马商家助手正在进行实时播报...", content: "鹿马商家助手正在进行实时播报...",
mode: 1 //0省电模式 1流氓模式 mode: 1 //0省电模式 1流氓模式
}, function(res) { }, function(res) {
console.log(res)
}); });
pushLive.isIgnoringBatteryOptimizations(function(res) { //检测是否限制后台运行 pushLive.isIgnoringBatteryOptimizations(function(res) { //检测是否限制后台运行
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
pushLive.startPollingTask(30);//5 pushLive.startPollingTask(30);//5
}else{ }else{
pushLive.requestIgnoreBatteryOptimizations(function(res) { // 申请后台运行(提高保活几率) pushLive.requestIgnoreBatteryOptimizations(function(res) { // 申请后台运行(提高保活几率)
console.log(res)
}); });
} }
}) })
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
if(result){ if(result){
var cllocationManger = plus.ios.import("CLLocationManager"); var cllocationManger = plus.ios.import("CLLocationManager");
var status = cllocationManger.authorizationStatus(); var status = cllocationManger.authorizationStatus();
console.log("status:" + status); //4 使用期间 3前后台都执行 0下次询问 2拒绝授权 //4 使用期间 3前后台都执行 0下次询问 2拒绝授权
if(status==0){ if(status==0){
uni.getLocation({ uni.getLocation({
type: 'gcj02', type: 'gcj02',
...@@ -153,7 +153,7 @@ ...@@ -153,7 +153,7 @@
}, },
//获取 语音消息 //获取 语音消息
async getnewsRemind(type){ async getnewsRemind(type){
// console.log('语音消息') // 语音消息
var date = new Date(); var date = new Date();
let hours = date.getHours();//当前 时间 小时 let hours = date.getHours();//当前 时间 小时
......
...@@ -20,7 +20,6 @@ export default { ...@@ -20,7 +20,6 @@ export default {
if(res_code==200){ if(res_code==200){
cback(res.data); cback(res.data);
}else{ }else{
console.log('201:',res.data.msg)
uni.showToast({ uni.showToast({
title:res.data.msg, title:res.data.msg,
icon:'none' icon:'none'
...@@ -40,7 +39,6 @@ export default { ...@@ -40,7 +39,6 @@ export default {
},1000) },1000)
return; return;
} }
console.log('400:',res.data.msg)
let msg=res.data.msg?res.data.msg:'请求错误' let msg=res.data.msg?res.data.msg:'请求错误'
uni.showToast({ uni.showToast({
title:msg, title:msg,
...@@ -48,7 +46,6 @@ export default { ...@@ -48,7 +46,6 @@ export default {
}) })
} }
}).catch(err => { }).catch(err => {
console.log('请求异常:',err);
uni.showToast({ uni.showToast({
title:'请求异常', title:'请求异常',
icon:'none' icon:'none'
...@@ -73,7 +70,6 @@ export default { ...@@ -73,7 +70,6 @@ export default {
if(res_code==200){ if(res_code==200){
cback(res.data); cback(res.data);
}else{ }else{
console.log('201:',res.data.msg)
uni.showToast({ uni.showToast({
title:res.data.msg, title:res.data.msg,
icon:'none' icon:'none'
...@@ -93,7 +89,6 @@ export default { ...@@ -93,7 +89,6 @@ export default {
},1000) },1000)
return; return;
} }
console.log('400:',res.data.msg)
let msg=res.data.msg?res.data.msg:'请求错误' let msg=res.data.msg?res.data.msg:'请求错误'
uni.showToast({ uni.showToast({
title:msg, title:msg,
...@@ -101,7 +96,6 @@ export default { ...@@ -101,7 +96,6 @@ export default {
}) })
} }
}).catch(err => { }).catch(err => {
console.log('请求异常:',err);
uni.showToast({ uni.showToast({
title:'请求异常', title:'请求异常',
icon:'none' icon:'none'
......
...@@ -10,7 +10,6 @@ module.exports = { ...@@ -10,7 +10,6 @@ module.exports = {
return false; return false;
} }
} catch(e) { } catch(e) {
console.log('error:'+str+'!!!'+e);
return false; return false;
} }
} }
......
...@@ -34,10 +34,8 @@ const g_show_modal = { ...@@ -34,10 +34,8 @@ const g_show_modal = {
cancelText:op.cancelVal, cancelText:op.cancelVal,
success: (res)=> { success: (res)=> {
if (res.confirm) { if (res.confirm) {
console.log('用户点击确定');
resolve(); resolve();
} else if (res.cancel) { } else if (res.cancel) {
console.log('用户点击取消');
reject(); reject();
} }
} }
......
...@@ -94,7 +94,6 @@ export class show_model{ ...@@ -94,7 +94,6 @@ export class show_model{
showModalAnimationClose(){ showModalAnimationClose(){
var options = {type:'pop-out',duration:300}; var options = {type:'pop-out',duration:300};
plus.nativeObj.View.startAnimation(options,{view:this.bodyModel},{view:this.cancelModel},{view:this.viewconfirm},function(){ plus.nativeObj.View.startAnimation(options,{view:this.bodyModel},{view:this.cancelModel},{view:this.viewconfirm},function(){
console.log('plus.nativeObj.View.startAnimation动画结束');
// 关闭原生动画 // 关闭原生动画
plus.nativeObj.View.clearAnimation(); plus.nativeObj.View.clearAnimation();
}); });
...@@ -103,7 +102,6 @@ export class show_model{ ...@@ -103,7 +102,6 @@ export class show_model{
var options = {type:'pop-in',duration:1000}; var options = {type:'pop-in',duration:1000};
plus.nativeObj.View.startAnimation(options,{view:this.bodyModel},{view:this.cancelModel},{view:this.viewconfirm},function(){ plus.nativeObj.View.startAnimation(options,{view:this.bodyModel},{view:this.cancelModel},{view:this.viewconfirm},function(){
console.log('plus.nativeObj.View.startAnimation动画结束');
// 关闭原生动画 // 关闭原生动画
plus.nativeObj.View.clearAnimation(); plus.nativeObj.View.clearAnimation();
}); });
...@@ -117,7 +115,6 @@ export class show_model{ ...@@ -117,7 +115,6 @@ export class show_model{
this.confirmModel.show(); this.confirmModel.show();
} }
hide(){ hide(){
console.log('隐藏了');
this.showModalAnimationClose(); this.showModalAnimationClose();
this.bodyModel.hide(); this.bodyModel.hide();
if(this.cancelModel){ if(this.cancelModel){
......
...@@ -3,5 +3,5 @@ ...@@ -3,5 +3,5 @@
* @param {String} t * @param {String} t
*/ */
export default function log(t) { export default function log(t) {
console.log(t); // 若不想打印内容请注释
} }
...@@ -74,8 +74,6 @@ ...@@ -74,8 +74,6 @@
value value
} }
}) { }) {
// console.info("infos");
// console.info("value",value);
this.setValue(value); this.setValue(value);
this.$emit("changeupdata",value);//触发change this.$emit("changeupdata",value);//触发change
......
...@@ -148,7 +148,6 @@ ...@@ -148,7 +148,6 @@
} }
}, },
value(n, o) { value(n, o) {
console.log('value改变了, 改变之前:' + o + ',改变之后:' + n)
} }
}, },
methods: { methods: {
......
...@@ -31,7 +31,6 @@ class QSForm { ...@@ -31,7 +31,6 @@ class QSForm {
delete this.formObj[name]; delete this.formObj[name];
} }
get(obj) { get(obj) {
console.info("obj",obj);
const { const {
name name
} = obj; } = obj;
......
...@@ -306,9 +306,6 @@ const _app = { ...@@ -306,9 +306,6 @@ const _app = {
}); });
if (status === 'success') { if (status === 'success') {
// log('getForm数据成功:' + JSON.stringify(res)); // log('getForm数据成功:' + JSON.stringify(res));
console.info(result,"result");//111
return new Promise(async (resolve, reject) => { return new Promise(async (resolve, reject) => {
try{ try{
const { const {
...@@ -325,7 +322,6 @@ const _app = { ...@@ -325,7 +322,6 @@ const _app = {
} }
}); });
} else { } else {
console.log(3)
// log('getForm数据失败:' + JSON.stringify(res)); // log('getForm数据失败:' + JSON.stringify(res));
return Promise.reject(result); return Promise.reject(result);
} }
......
...@@ -357,7 +357,6 @@ ...@@ -357,7 +357,6 @@
switch (this.type) { switch (this.type) {
case 'date': //date case 'date': //date
setObj = QSPicker.creatDateObj(this.dataSet); setObj = QSPicker.creatDateObj(this.dataSet);
console.log('setObj: ' + JSON.stringify(setObj));
let defaultDate = setObj.defaultValue; let defaultDate = setObj.defaultValue;
years = QSPicker.countYears(setObj.startYear || (new Date().getFullYear() - 5), setObj.endYear || (new Date().getFullYear() + years = QSPicker.countYears(setObj.startYear || (new Date().getFullYear() - 5), setObj.endYear || (new Date().getFullYear() +
5)); 5));
...@@ -469,7 +468,6 @@ ...@@ -469,7 +468,6 @@
value value
} }
}) { }) {
// console.log(JSON.stringify(e))
let changevalue; let changevalue;
switch (this.type) { switch (this.type) {
case 'city': case 'city':
...@@ -538,7 +536,6 @@ ...@@ -538,7 +536,6 @@
case 'date': case 'date':
data = ''; data = '';
let dateFormatArray = setObj.dateFormatArray; let dateFormatArray = setObj.dateFormatArray;
console.log('dateFormatArray:' + JSON.stringify(dateFormatArray));
for (let i = 1; i <= this.setObj.dateMode; i++) { for (let i = 1; i <= this.setObj.dateMode; i++) {
if (i <= 6) { if (i <= 6) {
let j = i - 1; let j = i - 1;
...@@ -638,7 +635,6 @@ ...@@ -638,7 +635,6 @@
} }
obj.data = data; obj.data = data;
this.$emit('confirm', obj); this.$emit('confirm', obj);
console.log(this.autoHide)
if(this.autoHide) if(this.autoHide)
this.hide(); this.hide();
}, },
......
...@@ -91,27 +91,15 @@ ...@@ -91,27 +91,15 @@
}, },
data() { data() {
const defaultSize = this.mode === 'middle'?.3:.45; const defaultSize = this.mode === 'middle'?.3:.45;
// console.log('defaultSize:' + defaultSize);
const height = this.height || defaultSize; const height = this.height || defaultSize;
// console.log('height:' + height);
const countHeight = wH * (Number(height)); const countHeight = wH * (Number(height));
// console.log('countHeight:' + countHeight);
const heightSize = countHeight + 'px'; const heightSize = countHeight + 'px';
// console.log('heightSize:' + heightSize);
const defaultFontScale = this.fontScale || .034; const defaultFontScale = this.fontScale || .034;
// console.log('defaultFontScale:' + defaultFontScale);
const titleSizeScale = Number(defaultFontScale) + .003; const titleSizeScale = Number(defaultFontScale) + .003;
// console.log('titleSizeScale:' + titleSizeScale);
const countTitleSize = wW * titleSizeScale; const countTitleSize = wW * titleSizeScale;
// console.log('countTitleSize:' + countTitleSize);
const titleSize = countTitleSize + 'px'; const titleSize = countTitleSize + 'px';
// console.log('titleSize:' + titleSize);
const countContentSize = wW * Number(defaultFontScale); const countContentSize = wW * Number(defaultFontScale);
// console.log('countContentSize:' + countContentSize);
const contentSize = countContentSize + 'px'; const contentSize = countContentSize + 'px';
// console.log('contentSize:' + contentSize);
return { return {
showPicker: false, showPicker: false,
classObj: { classObj: {
......
...@@ -80,13 +80,11 @@ ...@@ -80,13 +80,11 @@
}, },
methods:{ methods:{
changeinput(e){ changeinput(e){
console.info(e.detail.value);
this.phone = e.detail.value; this.phone = e.detail.value;
// this.setValue(e.detail.value); // this.setValue(e.detail.value);
}, },
//发送验证码按钮点击后 //发送验证码按钮点击后
shendcodefun(){ shendcodefun(){
console.info("124");
if (!(/^1[3456789]\d{9}$/.test(this.value))) { if (!(/^1[3456789]\d{9}$/.test(this.value))) {
this.$api.msg("手机号码有误"); this.$api.msg("手机号码有误");
} else { } else {
...@@ -111,7 +109,6 @@ ...@@ -111,7 +109,6 @@
this.$api.msg(res.msg); this.$api.msg(res.msg);
} }
}).catch((e)=>{ }).catch((e)=>{
console.info(e);
this.$api.msg(e); this.$api.msg(e);
}) })
} }
...@@ -121,7 +118,6 @@ ...@@ -121,7 +118,6 @@
}, },
//提示弹窗 //提示弹窗
change(e) { change(e) {
console.log('是否打开:' + e.show)
if (!e.show) { if (!e.show) {
this.showtip = false this.showtip = false
} }
...@@ -138,7 +134,7 @@ ...@@ -138,7 +134,7 @@
}, },
watch:{ watch:{
value(e){ value(e){
console.info(e);
} }
} }
} }
......
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
}; };
}, },
mounted() { mounted() {
//console.log("检测有没有设置支付密码~");
}, },
props: { props: {
//金额 //金额
...@@ -105,8 +105,6 @@ ...@@ -105,8 +105,6 @@
this.activeInput = this.value.length; this.activeInput = this.value.length;
}, },
forgetPwd: function() { forgetPwd: function() {
console.log('跳转到忘记密码')
uni.navigateTo({ uni.navigateTo({
url: '/pages/setPassword/setPayPassword' url: '/pages/setPassword/setPayPassword'
}); });
...@@ -140,9 +138,7 @@ ...@@ -140,9 +138,7 @@
async chailejiance(){ async chailejiance(){
let restow = await havepassword({}); let restow = await havepassword({});
if(restow.code==0){ if(restow.code==0){
console.log("检测用户设置了支付密码");
}else{ }else{
console.log("检测用户没有设置支付密码");
uni.showModal({ uni.showModal({
title: '温馨提示', title: '温馨提示',
content: '您还未设置鹿马支付密码,请前往设置!', content: '您还未设置鹿马支付密码,请前往设置!',
......
...@@ -71,7 +71,6 @@ ...@@ -71,7 +71,6 @@
watch:{ watch:{
dataList:{ dataList:{
handler(val){ handler(val){
console.log(val)
this.uploads = val; this.uploads = val;
}, },
immediate: true immediate: true
...@@ -80,7 +79,6 @@ ...@@ -80,7 +79,6 @@
methods:{ methods:{
previewImage (e) { previewImage (e) {
console.log(e)
var current = e.target.dataset.src var current = e.target.dataset.src
uni.previewImage({ uni.previewImage({
current: current, current: current,
...@@ -95,7 +93,6 @@ ...@@ -95,7 +93,6 @@
sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图,默认二者都有 sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图,默认二者都有
sourceType: ['album', 'camera'], //从相册选择 sourceType: ['album', 'camera'], //从相册选择
success: (res) => { success: (res) => {
console.log(res)
for(let i = 0; i< res.tempFiles.length; i++){ for(let i = 0; i< res.tempFiles.length; i++){
if(Math.ceil(res.tempFiles[i].size / 1024) < this.upload_max * 1024){ if(Math.ceil(res.tempFiles[i].size / 1024) < this.upload_max * 1024){
this.uploads.push(res.tempFiles[i].path) this.uploads.push(res.tempFiles[i].path)
...@@ -200,7 +197,6 @@ ...@@ -200,7 +197,6 @@
}, },
}); });
console.log(uploadFileRes);
} }
} }
} }
......
...@@ -65,7 +65,6 @@ ...@@ -65,7 +65,6 @@
// imgList: { // imgList: {
// handler(val, oldval) { // handler(val, oldval) {
// this.$emit("changes", val); // this.$emit("changes", val);
// // console.log(val)
// }, // },
// deep: true // deep: true
// } // }
...@@ -74,7 +73,6 @@ ...@@ -74,7 +73,6 @@
methods: { methods: {
chooseImg() { //选择图片 chooseImg() { //选择图片
// console.log('选择图片')
var count = this.count - this.imgList.length; var count = this.count - this.imgList.length;
uni.chooseImage({ uni.chooseImage({
count: count, count: count,
...@@ -84,13 +82,11 @@ ...@@ -84,13 +82,11 @@
var imgList = this.imgList; var imgList = this.imgList;
if (count <= this.count) { if (count <= this.count) {
imgList = this.imgList.concat(res.tempFilePaths); imgList = this.imgList.concat(res.tempFilePaths);
console.log('a',imgs)
this.$emit("changes", imgList); this.$emit("changes", imgList);
} else { } else {
var len = this.count - this.imgList.length; var len = this.count - this.imgList.length;
for (var i = 0; i < len; i++) { for (var i = 0; i < len; i++) {
imgList.push(res.tempFilePaths[i]) imgList.push(res.tempFilePaths[i])
console.log('bbb',res.tempFilePaths[i])
} }
this.$emit("changes", imgList); this.$emit("changes", imgList);
uni.showToast({ uni.showToast({
......
...@@ -12,7 +12,6 @@ ...@@ -12,7 +12,6 @@
// 两种使用方式 // 两种使用方式
// 1监听changes函数获得处理完成返回执 // 1监听changes函数获得处理完成返回执
// 2 使用 this.$refs.compress.yasuoImg(['bold:eqweew.jpg','bold:'fdsfdsf,jpg']).then(e=>{ // 2 使用 this.$refs.compress.yasuoImg(['bold:eqweew.jpg','bold:'fdsfdsf,jpg']).then(e=>{
// console.log(e) //返回值
// }) // })
export default { export default {
name: 'image-compress', name: 'image-compress',
...@@ -50,7 +49,6 @@ ...@@ -50,7 +49,6 @@
var ratio = parseFloat(res.width / res.height); //获得图片实际的宽高比 var ratio = parseFloat(res.width / res.height); //获得图片实际的宽高比
var width = res.width; var width = res.width;
var height = res.height; var height = res.height;
// console.log(this.maxwh)
var maxwh = this.maxwh; var maxwh = this.maxwh;
if (width > maxwh || height > maxwh) { if (width > maxwh || height > maxwh) {
if (width > height) { if (width > height) {
...@@ -67,9 +65,7 @@ ...@@ -67,9 +65,7 @@
// 将图片写入画布 // 将图片写入画布
var ctx = uni.createCanvasContext('myCanvas', this); var ctx = uni.createCanvasContext('myCanvas', this);
ctx.drawImage(res.path, 0, 0, width, height); ctx.drawImage(res.path, 0, 0, width, height);
// console.log(ctx)
ctx.draw(true, (e) => { ctx.draw(true, (e) => {
// console.log(e)
// 获取画布要裁剪的位置和宽度 均为百分比 * 画布中图片的宽度 // 获取画布要裁剪的位置和宽度 均为百分比 * 画布中图片的宽度
var fileType = res.path.replace(/^.+\./, ''); var fileType = res.path.replace(/^.+\./, '');
if (fileType == 'png') { if (fileType == 'png') {
...@@ -77,7 +73,6 @@ ...@@ -77,7 +73,6 @@
} else { } else {
fileType = 'jpg'; fileType = 'jpg';
} }
// console.log(fileType)
uni.canvasToTempFilePath({ uni.canvasToTempFilePath({
x: 0, x: 0,
y: 0, y: 0,
...@@ -89,7 +84,6 @@ ...@@ -89,7 +84,6 @@
canvasId: 'myCanvas', canvasId: 'myCanvas',
fileType: fileType, fileType: fileType,
success: (res2) => { success: (res2) => {
// console.log(res)
res2.oldWidth = res.width; res2.oldWidth = res.width;
res2.oldHeight = res.height; res2.oldHeight = res.height;
res2.width = width; res2.width = width;
......
...@@ -146,7 +146,6 @@ export default { ...@@ -146,7 +146,6 @@ export default {
}, },
//初始化htnl //初始化htnl
initval(htmltag){ initval(htmltag){
console.info("初始化富文本",htmltag);
setTimeout(()=>{ setTimeout(()=>{
this.editorCtx.setContents({ this.editorCtx.setContents({
html: htmltag, html: htmltag,
...@@ -179,16 +178,13 @@ export default { ...@@ -179,16 +178,13 @@ export default {
formData: this.uploaddata, formData: this.uploaddata,
success: uploadFileRes => { success: uploadFileRes => {
// 上传完成后处理 // 上传完成后处理
console.log(uploadFileRes.data,"上传成功后~");
let resdata = JSON.parse(uploadFileRes.data); let resdata = JSON.parse(uploadFileRes.data);
console.info(resdata,"resdata");
let srcimgs = resdata.data; let srcimgs = resdata.data;
srcimgs = srcimgs.replace(new RegExp(/thumb_/g), "") srcimgs = srcimgs.replace(new RegExp(/thumb_/g), "")
srcimgs =this.staticUrl+ srcimgs; srcimgs =this.staticUrl+ srcimgs;
// let htaltag = srcimgs; // let htaltag = srcimgs;
// let newStr = htaltag.replace(new RegExp(/\"/g), "\'"); // let newStr = htaltag.replace(new RegExp(/\"/g), "\'");
// console.log(newStr);
this.editorCtx.insertImage({ this.editorCtx.insertImage({
src: srcimgs, // 此处需要将图片地址切换成服务器返回的真实图片地址 src: srcimgs, // 此处需要将图片地址切换成服务器返回的真实图片地址
...@@ -232,7 +228,6 @@ export default { ...@@ -232,7 +228,6 @@ export default {
} }
}, },
statuschange(e) { statuschange(e) {
console.info(e,"通过 Context 方法改变编辑器内样式时触发,返回选区已设置的样式");
var detail = e.detail; var detail = e.detail;
this.checkStatus('bold', detail, 'showBold'); this.checkStatus('bold', detail, 'showBold');
this.checkStatus('italic', detail, 'showItalic'); this.checkStatus('italic', detail, 'showItalic');
...@@ -283,11 +278,10 @@ export default { ...@@ -283,11 +278,10 @@ export default {
}, },
// 编辑器内容改变时触发 // 编辑器内容改变时触发
changecontent(e){ changecontent(e){
console.info(e,"编辑器内容改变时触发");
}, },
//保存数据到父组件方法 //保存数据到父组件方法
release(isPublic) { release(isPublic) {
console.log(isPublic)
this.showSettingLayer = false; this.showSettingLayer = false;
this.editorCtx.getContents({ this.editorCtx.getContents({
success: res => { success: res => {
......
...@@ -29,7 +29,6 @@ export default { ...@@ -29,7 +29,6 @@ export default {
methods: { methods: {
// 点击发布 // 点击发布
editOk(res) { editOk(res) {
console.log(res);
} }
} }
} }
......
...@@ -371,8 +371,7 @@ data () { ...@@ -371,8 +371,7 @@ data () {
```javascript ```javascript
handleChange (e) { handleChange (e) {
if (e.change === 'init') { if (e.change === 'init') {
console.log(e.item.label) // 单选 选项1
console.log(e.item.map(item => item.label).join('-')) // 多选 选项1-选项11
} }
} }
``` ```
...@@ -415,7 +414,7 @@ handleChange (e) { ...@@ -415,7 +414,7 @@ handleChange (e) {
```javascript ```javascript
handleConfirm (e) { handleConfirm (e) {
console.log(e.item.label) // 选项1
} }
``` ```
...@@ -423,7 +422,7 @@ handleConfirm (e) { ...@@ -423,7 +422,7 @@ handleConfirm (e) {
```javascript ```javascript
handleConfirm (e) { handleConfirm (e) {
console.log(e.item.map(item => item.label).join('-')) // 选项1-选项11
} }
``` ```
......
...@@ -62,13 +62,11 @@ ...@@ -62,13 +62,11 @@
}, },
methods:{ methods:{
changeinput(e){ changeinput(e){
console.info(e.detail.value);
this.phone = e.detail.value; this.phone = e.detail.value;
// this.setValue(e.detail.value); // this.setValue(e.detail.value);
}, },
//发送验证码按钮点击后 //发送验证码按钮点击后
shendcodefun(){ shendcodefun(){
console.info("124");
if (!(/^1[3456789]\d{9}$/.test(this.value))) { if (!(/^1[3456789]\d{9}$/.test(this.value))) {
this.$api.msg("手机号码有误"); this.$api.msg("手机号码有误");
} else { } else {
...@@ -93,7 +91,6 @@ ...@@ -93,7 +91,6 @@
this.$api.msg(res.msg); this.$api.msg(res.msg);
} }
}).catch((e)=>{ }).catch((e)=>{
console.info(e);
this.$api.msg(e); this.$api.msg(e);
}) })
} }
...@@ -101,10 +98,8 @@ ...@@ -101,10 +98,8 @@
//提示弹窗 //提示弹窗
change(e) { change(e) {
console.log('是否打开:' + e.show)
console.log(this.$store.state.Timer,'退出登陆取消')
if (!e.show) { if (!e.show) {
console.log(this.$store.state.Timer,'退出登陆')
this.showtip = false this.showtip = false
} }
}, },
...@@ -124,7 +119,7 @@ ...@@ -124,7 +119,7 @@
}, },
watch:{ watch:{
value(e){ value(e){
console.info(e);
} }
} }
} }
......
...@@ -70,11 +70,11 @@ ...@@ -70,11 +70,11 @@
this.is_closed=this.$store.state.is_closed; this.is_closed=this.$store.state.is_closed;
}, },
updated (){ updated (){
// console.log('玩了')
}, },
watch:{ watch:{
dataorder(){ dataorder(){
// console.log('变了')
} }
}, },
computed: { computed: {
...@@ -119,7 +119,7 @@ ...@@ -119,7 +119,7 @@
break; break;
default: default:
//其他的 退款啥的 处理ok了 //其他的 退款啥的 处理ok了
console.info("1111",action);
break; break;
} }
}, },
...@@ -155,19 +155,18 @@ ...@@ -155,19 +155,18 @@
}, },
//立即接单 方法 外卖的 //立即接单 方法 外卖的
async immediatelyOrderfun(order_id, action,index){ async immediatelyOrderfun(order_id, action,index){
console.info(this.dataorder.order_id,"this.dataorder.order_id");
let res = await immediatelyOrder({ let res = await immediatelyOrder({
order_id:this.dataorder.order_id, order_id:this.dataorder.order_id,
}) })
console.info(res,"res1");
this.$api.msg(res.msg); this.$api.msg(res.msg);
if(res.code==0){ if(res.code==0){
this.$emit("reload",{index}); this.$emit("reload",{index});
} }
}, },
//商家拒绝接单的方法 //商家拒绝接单的方法
async refuseOrderfun(order_id, action,index){ async refuseOrderfun(order_id, action,index){
console.info("this.dataorder.order_id",this.dataorder.order_id);
let res = await refuseOrder({ let res = await refuseOrder({
order_id:this.dataorder.order_id, order_id:this.dataorder.order_id,
}); });
......
...@@ -100,7 +100,6 @@ ...@@ -100,7 +100,6 @@
edit_name(index){ edit_name(index){
this.e_data=this.names[index] this.e_data=this.names[index]
this.edit_box=true; this.edit_box=true;
console.log(id)
}, },
sub_name(){ sub_name(){
const data=this.e_data const data=this.e_data
...@@ -178,15 +177,12 @@ ...@@ -178,15 +177,12 @@
duration: 1000 duration: 1000
}); });
} }
console.log('success to upload image: ' + res.data)
resolve('success to upload image:' + remoteUrlIndex) resolve('success to upload image:' + remoteUrlIndex)
}else{ }else{
console.log('fail to upload image:'+res.data)
reject('failt to upload image:' + remoteUrlIndex) reject('failt to upload image:' + remoteUrlIndex)
} }
}, },
fail: function(res){ fail: function(res){
console.log('fail to upload image:'+res)
reject('failt to upload image:' + remoteUrlIndex) reject('failt to upload image:' + remoteUrlIndex)
} }
}) })
...@@ -238,7 +234,7 @@ ...@@ -238,7 +234,7 @@
imagePath: deletedImagePath imagePath: deletedImagePath
}, },
success: res => { success: res => {
console.log(res.data)
} }
}); });
} }
......
...@@ -92,9 +92,6 @@ ...@@ -92,9 +92,6 @@
uni.chooseImage({ uni.chooseImage({
count: _self.limit ? (_self.limit - _self.value.length) : 999, count: _self.limit ? (_self.limit - _self.value.length) : 999,
success: function(e){ success: function(e){
console.info("---------------------e----------------------");
console.info("e",e);
console.info("---------------------e----------------------");
var imagePathArr = e.tempFilePaths var imagePathArr = e.tempFilePaths
//如果设置了limit限制,在web上count参数无效,这里做判断控制选择的数量是否合要求 //如果设置了limit限制,在web上count参数无效,这里做判断控制选择的数量是否合要求
...@@ -124,12 +121,9 @@ ...@@ -124,12 +121,9 @@
var completeImages = 0 var completeImages = 0
console.info("_self.formData",_self.formData);
for(let i=0; i<imagePathArr.length;i++){ for(let i=0; i<imagePathArr.length;i++){
console.info(plus.io.convertLocalFileSystemURL(imagePathArr[i]),"plus.io.convertLocalFileSystemURL(imagePathArr[i])");
promiseWorkList.push(new Promise((resolve, reject)=>{ promiseWorkList.push(new Promise((resolve, reject)=>{
let remoteUrlIndex = remoteIndexStart + i let remoteUrlIndex = remoteIndexStart + i
console.info("_self.serverUrl",_self.serverUrl);
uni.uploadFile({ uni.uploadFile({
url:_self.serverUrl, url:_self.serverUrl,
fileType: 'image', fileType: 'image',
...@@ -141,7 +135,6 @@ ...@@ -141,7 +135,6 @@
}, },
name: keyname, name: keyname,
success: function(res){ success: function(res){
console.info("uploadres",res);
if(res.statusCode === 200){ if(res.statusCode === 200){
_self.value.push(JSON.parse(res.data)) _self.value.push(JSON.parse(res.data))
completeImages ++ completeImages ++
...@@ -153,15 +146,12 @@ ...@@ -153,15 +146,12 @@
duration: 1000 duration: 1000
}); });
} }
//console.log('success to upload image: ' + res.data)
resolve('success to upload image:' + remoteUrlIndex) resolve('success to upload image:' + remoteUrlIndex)
}else{ }else{
console.log('fail to upload image:'+res.data)
reject('failt to upload image:' + remoteUrlIndex) reject('failt to upload image:' + remoteUrlIndex)
} }
}, },
fail: function(res){ fail: function(res){
console.log('fail to upload image:'+res)
reject('failt to upload image:' + remoteUrlIndex) reject('failt to upload image:' + remoteUrlIndex)
} }
}) })
...@@ -213,7 +203,6 @@ ...@@ -213,7 +203,6 @@
id id
}, },
success: res => { success: res => {
console.log(res.data)
} }
}); });
} }
...@@ -224,10 +213,8 @@ ...@@ -224,10 +213,8 @@
this.$emit('input', this.value) this.$emit('input', this.value)
}, },
previewImage: function(e){ previewImage: function(e){
console.info("查看图片");
var imageIndex = e.currentTarget.dataset.index; var imageIndex = e.currentTarget.dataset.index;
console.info(this.value,imageIndex);
let arr = this.value.map((item,index)=>{ let arr = this.value.map((item,index)=>{
return this.staticUrl + item.data; return this.staticUrl + item.data;
......
...@@ -133,15 +133,12 @@ ...@@ -133,15 +133,12 @@
duration: 1000 duration: 1000
}); });
} }
console.log('success to upload image: ' + res.data)
resolve('success to upload image:' + remoteUrlIndex) resolve('success to upload image:' + remoteUrlIndex)
}else{ }else{
console.log('fail to upload image:'+res.data)
reject('failt to upload image:' + remoteUrlIndex) reject('failt to upload image:' + remoteUrlIndex)
} }
}, },
fail: function(res){ fail: function(res){
console.log('fail to upload image:'+res)
reject('failt to upload image:' + remoteUrlIndex) reject('failt to upload image:' + remoteUrlIndex)
} }
}) })
...@@ -178,7 +175,6 @@ ...@@ -178,7 +175,6 @@
imagePath: deletedImagePath imagePath: deletedImagePath
}, },
success: res => { success: res => {
console.log(res.data)
} }
}); });
} }
......
...@@ -53,7 +53,6 @@ ...@@ -53,7 +53,6 @@
}, },
//提示弹窗 //提示弹窗
change(e) { change(e) {
console.log('是否打开:' + e.show)
if (!e.show) { if (!e.show) {
this.showtip = false this.showtip = false
} }
......
...@@ -136,10 +136,8 @@ ...@@ -136,10 +136,8 @@
// summary: "武夷山岩茶大红袍乌龙茶浓香型中秋礼盒罐装", // summary: "武夷山岩茶大红袍乌龙茶浓香型中秋礼盒罐装",
// imageUrl: "https://kazuma.jxdsy.cn/attachs/2019/10/08/thumb_5d9c024455634.jpg", // imageUrl: "https://kazuma.jxdsy.cn/attachs/2019/10/08/thumb_5d9c024455634.jpg",
// success: (res)=> { // success: (res)=> {
// console.log("success:" + JSON.stringify(res));
// }, // },
// fail: (err)=> { // fail: (err)=> {
// console.log("fail:" + JSON.stringify(err));
// } // }
// }); // });
...@@ -149,56 +147,16 @@ ...@@ -149,56 +147,16 @@
type: 1, type: 1,
summary: "武夷山岩茶大红袍乌龙茶浓香型中秋礼盒罐装", summary: "武夷山岩茶大红袍乌龙茶浓香型中秋礼盒罐装",
success: (res)=> { success: (res)=> {
console.log("success:" + JSON.stringify(res));
}, },
fail: (err)=> { fail: (err)=> {
console.log("fail:" + JSON.stringify(err));
} }
}); });
// uni.share({
// provider: "weixin",
// scene:"WXSceneSession",//data.types,
// type: 2,
// imageUrl: "https://img-cdn-qiniu.dcloud.net.cn/uniapp/images/uni@2x.png",
// success: (res)=> {
// console.log("success:" + JSON.stringify(res));
// },
// fail: (err)=> {
// console.log("fail:" + JSON.stringify(err));
// }
// });
}else{ }else{
//分享到小程序
// uni.share({
// provider: 'weixin',
// scene: "WXSceneSession",
// type: 5,
// imageUrl: 'https://kazuma.jxdsy.cn/attachs/2019/10/08/thumb_5d9c024455634.jpg',
// title: '我正在使用鹿马APP,快来一起赚钱吧',
// miniProgram: {
// id: 'gh_abcdefg',
// path: 'pages/index/index',
// type: 0,
// webUrl: 'http://uniapp.dcloud.io'
// },
// success: ret => {
// console.log(JSON.stringify(ret));
// }
// });
// uni.share({
// provider: "weixin",
// scene:"WXSceneSession",//data.types,
// type: 2,
// imageUrl: "https://img-cdn-qiniu.dcloud.net.cn/uniapp/images/uni@2x.png",
// success: (res)=> {
// console.log("success:" + JSON.stringify(res));
// },
// fail: (err)=> {
// console.log("fail:" + JSON.stringify(err));
// }
// });
} }
......
...@@ -127,7 +127,7 @@ export default { ...@@ -127,7 +127,7 @@ export default {
_self.upload(_self.upload_auto); _self.upload(_self.upload_auto);
}, },
fail: function(err) { fail: function(err) {
console.log(err);
} }
}); });
}, },
...@@ -193,7 +193,7 @@ const upload = function(options) { ...@@ -193,7 +193,7 @@ const upload = function(options) {
formData: extra, formData: extra,
success: function(res) { success: function(res) {
var data = res.data; var data = res.data;
console.warn('sunui-upimg - 如发现没有获取到返回值请到源码191行修改后端返回图片路径以便正常使用插件', JSON.parse(data)); //sunui-upimg - 如发现没有获取到返回值请到源码191行修改后端返回图片路径以便正常使用插件', JSON.parse(data));
try { try {
//Tip : 切记->主要修改这里图片的返回值为真实返回路径!!! 详情见示例 //Tip : 切记->主要修改这里图片的返回值为真实返回路径!!! 详情见示例
data = JSON.parse(res.data).info; data = JSON.parse(res.data).info;
...@@ -212,7 +212,6 @@ const upload = function(options) { ...@@ -212,7 +212,6 @@ const upload = function(options) {
} }
}, },
fail: function(res) { fail: function(res) {
console.log(res);
if (fail) { if (fail) {
fail(res); fail(res);
} }
......
...@@ -149,7 +149,7 @@ ...@@ -149,7 +149,7 @@
canvases[this.canvasId].scrollEnd(e); canvases[this.canvasId].scrollEnd(e);
}, },
error(e) { error(e) {
console.log(e)
} }
}, },
}; };
......
...@@ -5088,7 +5088,6 @@ Event.prototype.trigger = function() { ...@@ -5088,7 +5088,6 @@ Event.prototype.trigger = function() {
try { try {
listener.apply(null, params); listener.apply(null, params);
} catch (e) { } catch (e) {
console.error(e);
} }
}); });
} }
...@@ -5262,7 +5261,7 @@ Charts.prototype.updateData = function() { ...@@ -5262,7 +5261,7 @@ Charts.prototype.updateData = function() {
Charts.prototype.zoom = function() { Charts.prototype.zoom = function() {
var val = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : this.opts.xAxis.itemCount; var val = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : this.opts.xAxis.itemCount;
if (this.opts.enableScroll !== true) { if (this.opts.enableScroll !== true) {
console.log('请启用滚动条后使用!') //'请启用滚动条后使用!
return; return;
} }
//当前屏幕中间点 //当前屏幕中间点
...@@ -5399,7 +5398,7 @@ Charts.prototype.showToolTip = function(e) { ...@@ -5399,7 +5398,7 @@ Charts.prototype.showToolTip = function(e) {
touches = e.mp.changedTouches[0]; touches = e.mp.changedTouches[0];
} }
if (!touches) { if (!touches) {
console.log("touchError");
} }
var _touches$ = getTouches(touches, this.opts, e); var _touches$ = getTouches(touches, this.opts, e);
var currentOffset = this.scrollOption.currentOffset; var currentOffset = this.scrollOption.currentOffset;
......
...@@ -117,7 +117,6 @@ ...@@ -117,7 +117,6 @@
//#ifdef MP-TOUTIAO //#ifdef MP-TOUTIAO
setTimeout(() => { setTimeout(() => {
uni.createSelectorQuery().in(this).select(`#${this.elId}`).boundingClientRect().exec((ret) => { uni.createSelectorQuery().in(this).select(`#${this.elId}`).boundingClientRect().exec((ret) => {
console.log(ret)
this.animation = `notice ${ret[0].width / this.speed}s linear infinite both`; this.animation = `notice ${ret[0].width / this.speed}s linear infinite both`;
}); });
}, 500) }, 500)
......
...@@ -159,7 +159,7 @@ const util = { ...@@ -159,7 +159,7 @@ const util = {
key: 'search:history', key: 'search:history',
data: searchHistory, data: searchHistory,
success: function() { success: function() {
// console.log('success');
} }
}); });
}, },
...@@ -170,7 +170,7 @@ const util = { ...@@ -170,7 +170,7 @@ const util = {
uni.removeStorage({ uni.removeStorage({
key: 'search:history', key: 'search:history',
success: function(res) { success: function(res) {
console.log('success');
} }
}); });
return [] return []
......
...@@ -27,10 +27,9 @@ ...@@ -27,10 +27,9 @@
options.engine = 'iFly'; options.engine = 'iFly';
that.inputValue = ""; that.inputValue = "";
plus.speech.startRecognize(options, function (s) { plus.speech.startRecognize(options, function (s) {
console.log(s);
that.inputValue += s; that.inputValue += s;
}, function (e) { }, function (e) {
console.log("语音识别失败:" + e.message); //("语音识别失败:" + e.message);
}); });
}, },
sendMessge: function () { sendMessge: function () {
......
...@@ -208,7 +208,7 @@ function html2json(html, customHandler, imageProp, host) { ...@@ -208,7 +208,7 @@ function html2json(html, customHandler, imageProp, host) {
// merge into parent tag // merge into parent tag
const node = bufArray.shift(); const node = bufArray.shift();
if (node.tag !== tag) { if (node.tag !== tag) {
console.error('invalid state: mismatch end tag'); // error('invalid state: mismatch end tag');
} }
// 当有缓存source资源时于于video补上src资源 // 当有缓存source资源时于于video补上src资源
......
...@@ -378,7 +378,7 @@ var calendar = { ...@@ -378,7 +378,7 @@ var calendar = {
* @param m solar month * @param m solar month
* @param d solar day * @param d solar day
* @return JSON object * @return JSON object
* @eg:console.log(calendar.solar2lunar(1987,11,01)); * @eg:(calendar.solar2lunar(1987,11,01));
*/ */
solar2lunar: function (y, m, d) { // 参数区间1900.1.31~2100.12.31 solar2lunar: function (y, m, d) { // 参数区间1900.1.31~2100.12.31
// 年份限定、上限 // 年份限定、上限
...@@ -497,7 +497,7 @@ var calendar = { ...@@ -497,7 +497,7 @@ var calendar = {
* @param d lunar day * @param d lunar day
* @param isLeapMonth lunar month is leap or not.[如果是农历闰月第四个参数赋值true即可] * @param isLeapMonth lunar month is leap or not.[如果是农历闰月第四个参数赋值true即可]
* @return JSON object * @return JSON object
* @eg:console.log(calendar.lunar2solar(1987,9,10)); * @eg:(calendar.lunar2solar(1987,9,10));
*/ */
lunar2solar: function (y, m, d, isLeapMonth) { // 参数区间1900.1.31~2100.12.1 lunar2solar: function (y, m, d, isLeapMonth) { // 参数区间1900.1.31~2100.12.1
var isLeapMonth = !!isLeapMonth var isLeapMonth = !!isLeapMonth
......
...@@ -230,11 +230,9 @@ ...@@ -230,11 +230,9 @@
this.selectDay = canlender.month + '' + canlender.date + '' this.selectDay = canlender.month + '' + canlender.date + ''
this.canlender = canlender this.canlender = canlender
if (this.slide === 'none') { if (this.slide === 'none') {
// console.log(before);
this.duration = 0 this.duration = 0
this.currentIndex = 0 this.currentIndex = 0
if (first && index === 0) { if (first && index === 0) {
// console.log('第一次进入');
this.canlender = canlender this.canlender = canlender
} else { } else {
if (index === 0) { if (index === 0) {
...@@ -249,7 +247,6 @@ ...@@ -249,7 +247,6 @@
} }
this.selectDay = canlender.month + '' + canlender.date + '' this.selectDay = canlender.month + '' + canlender.date + ''
this.hold = false this.hold = false
// console.log(this.canlender)
this.setEmit(this.canlender) this.setEmit(this.canlender)
return return
} }
...@@ -431,7 +428,6 @@ ...@@ -431,7 +428,6 @@
} }
if (!ischeck) return false if (!ischeck) return false
if (isDay) return false if (isDay) return false
// console.log(isDay);
let month = let month =
canlender.weeks[week][index].month < 10 ? '0' + canlender.weeks[week][index].month : canlender.weeks[week][index].month canlender.weeks[week][index].month < 10 ? '0' + canlender.weeks[week][index].month : canlender.weeks[week][index].month
let date = canlender.weeks[week][index].date < 10 ? '0' + let date = canlender.weeks[week][index].date < 10 ? '0' +
...@@ -461,7 +457,6 @@ ...@@ -461,7 +457,6 @@
let date = _date.getDate() // 日 let date = _date.getDate() // 日
let day = _date.getDay() // 天 let day = _date.getDay() // 天
let canlender = [] let canlender = []
// console.log(selected)
let dates = { let dates = {
firstDay: new Date(year, month - 1, 1).getDay(), firstDay: new Date(year, month - 1, 1).getDay(),
lastMonthDays: [], // 上个月末尾几天 lastMonthDays: [], // 上个月末尾几天
...@@ -619,7 +614,6 @@ ...@@ -619,7 +614,6 @@
setTimeout(() => this.getQueryDom(1), 50) setTimeout(() => this.getQueryDom(1), 50)
return return
} }
// console.log(e[0][index])
if (e[0][index]) { if (e[0][index]) {
this.domHeihgt = e[0][index].height this.domHeihgt = e[0][index].height
} }
......
...@@ -128,7 +128,7 @@ ...@@ -128,7 +128,7 @@
}, },
watch: { watch: {
pattern(newValue, oldValue) { pattern(newValue, oldValue) {
console.log(JSON.stringify(newValue));
this.styles = Object.assign({}, this.styles, newValue); this.styles = Object.assign({}, this.styles, newValue);
} }
}, },
......
...@@ -53,14 +53,14 @@ ...@@ -53,14 +53,14 @@
}; };
}, },
mounted() { mounted() {
console.log('啊啊啊啊')
}, },
updated (){ updated (){
console.log('玩了')
}, },
watch:{ watch:{
dataorder(){ dataorder(){
console.log('变了')
} }
}, },
computed: { computed: {
...@@ -77,8 +77,7 @@ ...@@ -77,8 +77,7 @@
let action = event.currentTarget.dataset.action; let action = event.currentTarget.dataset.action;
let order_id = event.currentTarget.dataset.orderid; let order_id = event.currentTarget.dataset.orderid;
let index=this.index; let index=this.index;
uni.setStorageSync('obj',{order_id,index}); uni.setStorageSync('obj',{order_id,index});
console.log(order_id,'aaa')
switch (action) { switch (action) {
case 'immediatelyOrder': //立即接单 OK case 'immediatelyOrder': //立即接单 OK
this.immediatelyOrderfun(order_id, action,index); this.immediatelyOrderfun(order_id, action,index);
...@@ -97,7 +96,6 @@ ...@@ -97,7 +96,6 @@
break; break;
default: default:
//其他的 退款啥的 处理ok了 //其他的 退款啥的 处理ok了
console.info("1111",action);
break; break;
} }
}, },
......
...@@ -46,7 +46,6 @@ ...@@ -46,7 +46,6 @@
}, },
methods:{ methods:{
tapInfo(item,index) { tapInfo(item,index) {
console.info(item,index);
//设置开关 防止点击过快 //设置开关 防止点击过快
if(this.isswitch==true){ if(this.isswitch==true){
this.isswitch = false; this.isswitch = false;
...@@ -81,7 +80,6 @@ ...@@ -81,7 +80,6 @@
// this.$emit("changeSpecList",{data:chinddata,index:this.isindex,specList_item_id:this.chinddata.id}); // this.$emit("changeSpecList",{data:chinddata,index:this.isindex,specList_item_id:this.chinddata.id});
} }
console.info("isindex",this.isindex);
//把选中的值传回去 //把选中的值传回去
......
...@@ -50,7 +50,6 @@ ...@@ -50,7 +50,6 @@
name: widgetInfo.name //没啥用 name: widgetInfo.name //没啥用
}, },
success: (res) => { success: (res) => {
console.log(res);
if (res.data.status == 200 && res.data.data.update) { if (res.data.status == 200 && res.data.data.update) {
//我的后台会返回一个安装包地址(pkgUrl),升级包地址(wgtUrl) //我的后台会返回一个安装包地址(pkgUrl),升级包地址(wgtUrl)
//判空来判断是非是整包升级还是资源包升级 //判空来判断是非是整包升级还是资源包升级
...@@ -70,7 +69,7 @@ ...@@ -70,7 +69,7 @@
} }
}, },
fail: (error) => { fail: (error) => {
console.log(error);
} }
}); });
}); });
......
...@@ -130,7 +130,6 @@ ...@@ -130,7 +130,6 @@
}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) => {
...@@ -141,7 +140,6 @@ ...@@ -141,7 +140,6 @@
}, function() { }, function() {
plus.runtime.restart(); plus.runtime.restart();
}, (e) => { }, (e) => {
console.log(e);
this.success = false this.success = false
uni.showToast({ uni.showToast({
title: '安装升级包失败,请重新下载最新的安装包', title: '安装升级包失败,请重新下载最新的安装包',
...@@ -161,7 +159,6 @@ ...@@ -161,7 +159,6 @@
checkVersionClick() { checkVersionClick() {
//直接不直接 苹果不做更新 //直接不直接 苹果不做更新
if(uni.getSystemInfoSync().platform == 'ios'){ if(uni.getSystemInfoSync().platform == 'ios'){
console.log('zheli')
uni.request({ uni.request({
url: config.SiteBaseUrl+"user/appVersions", url: config.SiteBaseUrl+"user/appVersions",
data: { data: {
...@@ -222,7 +219,7 @@ ...@@ -222,7 +219,7 @@
}, },
fail: (error) => { fail: (error) => {
console.log(error);
} }
}); });
} }
......
...@@ -65,7 +65,6 @@ ...@@ -65,7 +65,6 @@
}, },
onShow() { onShow() {
this.statusBarHeight=uni.getSystemInfoSync().statusBarHeight*2;//顶部状态栏高度 this.statusBarHeight=uni.getSystemInfoSync().statusBarHeight*2;//顶部状态栏高度
console.info(this.statusBarHeight,"this.statusBarHeight")
}, },
methods:{ methods:{
......
...@@ -148,7 +148,6 @@ ...@@ -148,7 +148,6 @@
}, },
onShow() { onShow() {
this.statusBarHeight=uni.getSystemInfoSync().statusBarHeight*2;//顶部状态栏高度 this.statusBarHeight=uni.getSystemInfoSync().statusBarHeight*2;//顶部状态栏高度
console.info(this.statusBarHeight,"this.statusBarHeight")
}, },
methods:{ methods:{
......
...@@ -307,7 +307,6 @@ ...@@ -307,7 +307,6 @@
}, },
//滚动到最底部 //滚动到最底部
onReachBottom(){ onReachBottom(){
console.log("11");
if(!this.isallshow && this.tabactive==2){ if(!this.isallshow && this.tabactive==2){
this.shop_couponFun(); this.shop_couponFun();
...@@ -380,7 +379,6 @@ ...@@ -380,7 +379,6 @@
if(res.code==0){ if(res.code==0){
if( list.length!=0){ if( list.length!=0){
this.shoplist = [...this.shoplist,...list]; this.shoplist = [...this.shoplist,...list];
console.log(this.shoplist)
this.xianshi = true; this.xianshi = true;
}else{ }else{
// this.$api.msg("没有更多了~"); // this.$api.msg("没有更多了~");
...@@ -416,7 +414,6 @@ ...@@ -416,7 +414,6 @@
//已发卡券 //已发卡券
async shop_couponFun(){ async shop_couponFun(){
this.page++; this.page++;
console.info(this.page,'1111')
let res = await couponList({ let res = await couponList({
page:this.page, page:this.page,
}); });
...@@ -444,10 +441,7 @@ ...@@ -444,10 +441,7 @@
if(res.code==0){ if(res.code==0){
this.$api.msg(res.msg); this.$api.msg(res.msg);
console.log("status",this.cardlist,index);
this.cardlist[index].status = item.status==0?2:0; this.cardlist[index].status = item.status==0?2:0;
console.log("status",this.cardlist[index].status);
}else{ }else{
this.$api.msg(res.msg); this.$api.msg(res.msg);
} }
...@@ -496,12 +490,10 @@ ...@@ -496,12 +490,10 @@
// let iddata = []; // let iddata = [];
this.shoplist = this.shoplist.map((item1,index)=>{//参与的商品默认选中的 this.shoplist = this.shoplist.map((item1,index)=>{//参与的商品默认选中的
console.info(item1.product_id,"000");
// if(){ // if(){
// } // }
console.info(Number(item1.product_id),JSON.stringify(res.data.goods_ids),"item1.product_id");
if(res.data.goods_ids.indexOf(item1.product_id)!=-1){ if(res.data.goods_ids.indexOf(item1.product_id)!=-1){
item1.checked = true; item1.checked = true;
...@@ -543,22 +535,17 @@ ...@@ -543,22 +535,17 @@
}, },
//发放范围 //发放范围
radioChange(e){ radioChange(e){
console.log(e.detail.value);
this.parameter.give_type = e.detail.value; this.parameter.give_type = e.detail.value;
}, },
//参与的商品 //参与的商品
radioChange1(e){ radioChange1(e){
//console.log(e);
this.parameter.range_type = e.detail.value; this.parameter.range_type = e.detail.value;
}, },
radioChange2(e){ radioChange2(e){
//选择产品的单选 //选择产品的单选
console.log(e);
this.parameter.goods_id = e.detail.value; this.parameter.goods_id = e.detail.value;
console.log(this.parameter.goods_id);
console.log(this.shoplist);
this.shoplist = this.shoplist.map((item1,index)=>{//参与的商品默认选中的 this.shoplist = this.shoplist.map((item1,index)=>{//参与的商品默认选中的
if(this.parameter.goods_id.indexOf(item1.product_id)!=-1){ if(this.parameter.goods_id.indexOf(item1.product_id)!=-1){
item1.checked = true; item1.checked = true;
...@@ -579,18 +566,14 @@ ...@@ -579,18 +566,14 @@
this.showshare = false this.showshare = false
}, },
change(e) { change(e) {
console.log('是否打开:' + e.show)
if (!e.show) { if (!e.show) {
this.showshare = false this.showshare = false
} }
}, },
//时间组件事件 //时间组件事件
onConfirm(e){ onConfirm(e){
console.log(e);
// this.parameter.start_time = e.checkArr[0]+"年"+e.checkArr[1]+"月"+e.checkArr[2]+"日"; // this.parameter.start_time = e.checkArr[0]+"年"+e.checkArr[1]+"月"+e.checkArr[2]+"日";
// this.parameter.end_time = e.checkArr[3]+"年"+e.checkArr[4]+"月"+e.checkArr[5]+"日"; // this.parameter.end_time = e.checkArr[3]+"年"+e.checkArr[4]+"月"+e.checkArr[5]+"日";
this.parameter.start_time = e.checkArr[0]+"-"+e.checkArr[1]+"-"+e.checkArr[2]; this.parameter.start_time = e.checkArr[0]+"-"+e.checkArr[1]+"-"+e.checkArr[2];
this.parameter.end_time = e.checkArr[3]+"-"+e.checkArr[4]+"-"+e.checkArr[5]; this.parameter.end_time = e.checkArr[3]+"-"+e.checkArr[4]+"-"+e.checkArr[5];
...@@ -608,10 +591,7 @@ ...@@ -608,10 +591,7 @@
} }
}, },
watch:{ watch:{
tabactive(e){ tabactive(e){
console.log(e);
if(e==2){ if(e==2){
//已发卡券 //已发卡券
this.page = 0; this.page = 0;
......
...@@ -142,8 +142,6 @@ ...@@ -142,8 +142,6 @@
} }
}, },
onReachBottom(){ onReachBottom(){
console.log("11");
if(!this.isallshow){ if(!this.isallshow){
this.goods_product_list(); this.goods_product_list();
} }
...@@ -209,7 +207,6 @@ ...@@ -209,7 +207,6 @@
// }); // });
// } // }
console.info(id,"id");
res = await autoManageRoom({ res = await autoManageRoom({
room_id:id,//this.idArr, room_id:id,//this.idArr,
...@@ -245,7 +242,6 @@ ...@@ -245,7 +242,6 @@
this.goods_product_list(); this.goods_product_list();
}, },
checkboxChange(e){//单选事件 列表 checkboxChange(e){//单选事件 列表
console.info(e.detail.value);
this.idArr = e.detail.value; this.idArr = e.detail.value;
}, },
...@@ -268,22 +264,17 @@ ...@@ -268,22 +264,17 @@
}, },
radioChange(e){//全选 反选 radioChange(e){//全选 反选
console.info(e);
this.isallchind = !this.isallchind; this.isallchind = !this.isallchind;
if(e.detail.value.length==0){ if(e.detail.value.length==0){
console.log("反选");
this.taggledata(2) this.taggledata(2)
}else{ }else{
this.taggledata(1) this.taggledata(1)
console.log("全选");
} }
}, },
//活动抽奖选择商品 //活动抽奖选择商品
Selectiondata(data){ Selectiondata(data){
console.info(data);
//选择商品卡回调 //选择商品卡回调
if(this.isselect==1){ if(this.isselect==1){
uni.setStorageSync('selectaddres', {data,sendindex:this.sendindex});//存 uni.setStorageSync('selectaddres', {data,sendindex:this.sendindex});//存
......
...@@ -87,7 +87,6 @@ ...@@ -87,7 +87,6 @@
let res = await getPrinterList({}); let res = await getPrinterList({});
if(res.code==0){ if(res.code==0){
console.log(res.data.length!=0)
if(res.data.length!=0){ if(res.data.length!=0){
uni.hideLoading(); uni.hideLoading();
}else{ }else{
......
...@@ -107,7 +107,6 @@ export default { ...@@ -107,7 +107,6 @@ export default {
}; };
}, },
onLoad(options) { onLoad(options) {
// console.log(options)
this.init(); this.init();
var that = this; var that = this;
// 判断为正常订单 // 判断为正常订单
...@@ -118,7 +117,6 @@ export default { ...@@ -118,7 +117,6 @@ export default {
vendor_id: options.vendor vendor_id: options.vendor
}; };
checkLogistics(params).then(res => { checkLogistics(params).then(res => {
console.log(res);
if (res.code == 0) { if (res.code == 0) {
let data = res.data; let data = res.data;
let list = this.checkArray(data.Traces) ? data.Traces : []; let list = this.checkArray(data.Traces) ? data.Traces : [];
...@@ -138,7 +136,6 @@ export default { ...@@ -138,7 +136,6 @@ export default {
type: 2 type: 2
}; };
viewLogistics(refundParams).then(res => { viewLogistics(refundParams).then(res => {
console.log(res)
if (res.code == 0) { if (res.code == 0) {
this.list = res.data.list; this.list = res.data.list;
let logistics_info = this.getLogisticsConfig(res.data.shipperCode); let logistics_info = this.getLogisticsConfig(res.data.shipperCode);
......
...@@ -559,7 +559,7 @@ ...@@ -559,7 +559,7 @@
methods: { methods: {
//是否推荐 //是否推荐
changetuijian(e){ changetuijian(e){
console.info(e,"eee");
if(e.target.value.indexOf("1")!=-1){//选中了 if(e.target.value.indexOf("1")!=-1){//选中了
this.form.is_tuijian = "1"; this.form.is_tuijian = "1";
}else{ }else{
...@@ -572,7 +572,7 @@ ...@@ -572,7 +572,7 @@
if(e.detail.column == 0){ if(e.detail.column == 0){
if(e.detail.value == 0){ if(e.detail.value == 0){
console.log('我滑动到普通商品')
this.$set(this.classData,1,[]); this.$set(this.classData,1,[]);
if(this.ordinary.length!=0){ if(this.ordinary.length!=0){
...@@ -580,9 +580,8 @@ ...@@ -580,9 +580,8 @@
this.classData[1].push(item.product_name); this.classData[1].push(item.product_name);
}) })
} }
// console.log(this.classData[1])
}else { }else {
console.log('我滑动到称重商品')
// this.classData[1] = []; // this.classData[1] = [];
this.$set(this.classData,1,[]); this.$set(this.classData,1,[]);
if(this.weigh.length!=0){ if(this.weigh.length!=0){
...@@ -596,9 +595,7 @@ ...@@ -596,9 +595,7 @@
}, },
bindData(e){ bindData(e){
let that = this let that = this
console.log(e)
if(e.detail.value[0] == 0){ if(e.detail.value[0] == 0){
console.log(that.ordinary.length,'左边')
if(that.ordinary.length != 0){ if(that.ordinary.length != 0){
that.linkage_id = that.ordinary[e.detail.value[1]].product_id that.linkage_id = that.ordinary[e.detail.value[1]].product_id
// that.product_id = that.ordinary[e.detail.value[1]].product_id // that.product_id = that.ordinary[e.detail.value[1]].product_id
...@@ -612,7 +609,6 @@ ...@@ -612,7 +609,6 @@
return false; return false;
} }
}else{ }else{
console.log(that.weigh.length,'右边')
if(that.weigh.length != 0){ if(that.weigh.length != 0){
that.linkage_id = that.weigh[e.detail.value[1]].product_id that.linkage_id = that.weigh[e.detail.value[1]].product_id
// that.product_id = that.weigh[e.detail.value[1]].product_id // that.product_id = that.weigh[e.detail.value[1]].product_id
...@@ -628,7 +624,6 @@ ...@@ -628,7 +624,6 @@
} }
that.eleProductInfofun(that.linkage_id,2); that.eleProductInfofun(that.linkage_id,2);
this.is_datashow = false; this.is_datashow = false;
console.log(this.is_datashow)
}, },
...@@ -660,7 +655,6 @@ ...@@ -660,7 +655,6 @@
async findEleProduct(results){ async findEleProduct(results){
uni.showLoading({title:'请稍后'}); uni.showLoading({title:'请稍后'});
let res=await findEleProduct({code:results.code}); let res=await findEleProduct({code:results.code});
console.info("res1",res);
uni.hideLoading(); uni.hideLoading();
if(res.code==-1){ //没有就录入 if(res.code==-1){ //没有就录入
if(results.data.msg=='暂未收录此商品'){ if(results.data.msg=='暂未收录此商品'){
...@@ -719,8 +713,6 @@ ...@@ -719,8 +713,6 @@
this.c_pics=[{code:0,data:res.data.photo,msg:"success",time:"1587101904"}]; this.c_pics=[{code:0,data:res.data.photo,msg:"success",time:"1587101904"}];
// console.log(this.form.product_name,12131321314312423142123321);
// console.log(this.chindformList);
for(var i = 0; i < this.chindformList.length; i++) { for(var i = 0; i < this.chindformList.length; i++) {
if(this.chindformList[i].cate_id==res.data.cate_id){ if(this.chindformList[i].cate_id==res.data.cate_id){
...@@ -747,11 +739,9 @@ ...@@ -747,11 +739,9 @@
}, },
method:'GET', method:'GET',
success: (results) => { success: (results) => {
console.log(results)
if(results.data.code==1){ if(results.data.code==1){
results.code=code; results.code=code;
results.isScanCode=false; results.isScanCode=false;
console.info(results,"111");
this.findEleProduct(results); this.findEleProduct(results);
}else{ }else{
results.code=code; results.code=code;
...@@ -764,19 +754,16 @@ ...@@ -764,19 +754,16 @@
}) })
}, },
fail:(err)=>{ fail:(err)=>{
console.log(err)
} }
}); });
}, },
radioChange(e){ radioChange(e){
// console.log(this.isType) this.form.sell_type = e.detail.value
this.form.sell_type = e.detail.value
console.log(this.form.sell_type)
}, },
mandatoryradioChange(e){ mandatoryradioChange(e){
this.form.mandatory = e.detail.value this.form.mandatory = e.detail.value
console.log(this.form.mandatory)
}, },
radioChanges(e){ radioChanges(e){
...@@ -808,8 +795,6 @@ ...@@ -808,8 +795,6 @@
}, },
//分类选中 //分类选中
bindPickerChange(e){ bindPickerChange(e){
console.info(e.detail.value);
console.log(this.chindformList)
this.cate_name = this.chindformList[e.detail.value].cate_name; this.cate_name = this.chindformList[e.detail.value].cate_name;
this.form.cate_id = this.chindformList[e.detail.value].cate_id; this.form.cate_id = this.chindformList[e.detail.value].cate_id;
this.index = e.detail.value; this.index = e.detail.value;
...@@ -843,7 +828,6 @@ ...@@ -843,7 +828,6 @@
} }
if(second==1){ if(second==1){
console.log('第一次')
this.linkage_product_id = res.data.linkage_product_id this.linkage_product_id = res.data.linkage_product_id
} }
...@@ -969,14 +953,11 @@ ...@@ -969,14 +953,11 @@
// return false; // return false;
// } // }
// console.log(this.form.limit_num,this.form.store_count)
// if(!this.isInteger(this.form.limit_num) || !this.isInteger(this.form.store_count)){ // if(!this.isInteger(this.form.limit_num) || !this.isInteger(this.form.store_count)){
// this.$api.msg("秒杀库存或限购数量不能为小数"); // this.$api.msg("秒杀库存或限购数量不能为小数");
// return false; // return false;
// } // }
console.log(this.form.product_id)
console.log(this.product_id)
let can = { let can = {
action:this.product_id==''?'add':'edit', action:this.product_id==''?'add':'edit',
...@@ -1043,10 +1024,7 @@ ...@@ -1043,10 +1024,7 @@
can.product_id = this.product_id; can.product_id = this.product_id;
} }
//添加修改外卖产品 //添加修改外卖产品
console.log(can);
addEditEleProduct(can).then((res1)=>{ addEditEleProduct(can).then((res1)=>{
// console.log(res1,'成功了');
console.log("res1",res1);
if(res1.code==0){ if(res1.code==0){
this.$api.msg(res1.msg); this.$api.msg(res1.msg);
setTimeout(()=>{ setTimeout(()=>{
...@@ -1056,12 +1034,11 @@ ...@@ -1056,12 +1034,11 @@
this.$api.msg(res1.msg); this.$api.msg(res1.msg);
} }
}).catch(err=>{ }).catch(err=>{
console.log(err,'失败了');
}) })
}, },
pickerChange(e){ pickerChange(e){
console.log(e)
this.form.activity_id = this.seckilltimelist[e.detail.value[0]].activity_id; this.form.activity_id = this.seckilltimelist[e.detail.value[0]].activity_id;
}, },
// 秒杀列表 // 秒杀列表
......
...@@ -163,8 +163,7 @@ ...@@ -163,8 +163,7 @@
async eleProductInfofun(){ async eleProductInfofun(){
let res = await eleProductInfo({ let res = await eleProductInfo({
product_id:this.product_id, product_id:this.product_id,
}); });
// console.log(res,'法大师傅大师傅大师傅士大夫大师傅');
if(res.code==0){ if(res.code==0){
this.linkage_product_id = res.data.linkage_product_id this.linkage_product_id = res.data.linkage_product_id
this.bools = res.data.product_name; this.bools = res.data.product_name;
...@@ -223,21 +222,17 @@ ...@@ -223,21 +222,17 @@
} }
}) })
}else if(res.data.commodity_type == 'weigh'){ }else if(res.data.commodity_type == 'weigh'){
console.log(res.data.commodity_type,585555555555555555555555)
this.weigh.map(item=>{ this.weigh.map(item=>{
if(this.linkage_product_id == item.product_id){ if(this.linkage_product_id == item.product_id){
this.classValue = item.product_name this.classValue = item.product_name
console.log(this.classValue,item.product_name)
} }
console.log(this.classValue)
}) })
}else{ }else{
this.classValue = ''; this.classValue = '';
} }
console.log(this.classValue)
//属性选默认值 //属性选默认值
if(res.data.is_new==1){ if(res.data.is_new==1){
...@@ -330,10 +325,8 @@ ...@@ -330,10 +325,8 @@
can.action = "edit"; can.action = "edit";
can.product_id = this.product_id; can.product_id = this.product_id;
} }
//添加修改外卖产品 //添加修改外卖产品
console.log('这里了')
addEditEleProduct(can).then((res1)=>{ addEditEleProduct(can).then((res1)=>{
console.log(res1)
if(res1.code==0){ if(res1.code==0){
this.$api.msg(res1.msg); this.$api.msg(res1.msg);
setTimeout(()=>{ setTimeout(()=>{
......
...@@ -197,7 +197,6 @@ ...@@ -197,7 +197,6 @@
getshopclass({}).then(res=>{ getshopclass({}).then(res=>{
if(res.code == 0){ if(res.code == 0){
// console.log(res.data)
this.ordinary = res.data.ordinary this.ordinary = res.data.ordinary
this.weigh = res.data.weigh this.weigh = res.data.weigh
this.classData[1] = Array.from(res.data.ordinary) this.classData[1] = Array.from(res.data.ordinary)
...@@ -207,12 +206,10 @@ ...@@ -207,12 +206,10 @@
} }
} }
// console.log(this.classData[1])
} }
}) })
this.isadd = opdata.isadd this.isadd = opdata.isadd
// console.log(this.isadd,'aaa')
this.c_formData.user_token = this.$store.state.token; this.c_formData.user_token = this.$store.state.token;
this.activity_type = opdata.activity_type, this.activity_type = opdata.activity_type,
this.isShow = this.activity_type==1?true:false this.isShow = this.activity_type==1?true:false
...@@ -220,26 +217,21 @@ ...@@ -220,26 +217,21 @@
this.typeManagerfun(); this.typeManagerfun();
this.getActivityListfun(); //获取数据列表 this.getActivityListfun(); //获取数据列表
// console.log(JSON.parse(opdata.results).data.code,111111111111111111111111111111111)
// let results=JSON.parse(opdata.results); // let results=JSON.parse(opdata.results);
// this.issancodeType = opdata.results.issancodeType // this.issancodeType = opdata.results.issancodeType
// this.isType = opdata.results.isType // this.isType = opdata.results.isType
// console.log(this.isType)
}, },
methods: { methods: {
columnbindData(e){ columnbindData(e){
// console.log(e,'啊啊啊啊啊')
this.classDataValue[e.detail.column]=e.detail.value; this.classDataValue[e.detail.column]=e.detail.value;
if(e.detail.column == 0){ if(e.detail.column == 0){
if(e.detail.value == 0){ if(e.detail.value == 0){
console.log('我滑动到普通商品')
this.$set(this.classData,1,[]); this.$set(this.classData,1,[]);
if(this.ordinary.length!=0){ if(this.ordinary.length!=0){
this.ordinary.map(item=>{ this.ordinary.map(item=>{
...@@ -247,10 +239,7 @@ ...@@ -247,10 +239,7 @@
}) })
} }
console.log(this.classData[1])
}else { }else {
console.log('我滑动到称重商品')
// this.classData[1] = []; // this.classData[1] = [];
this.$set(this.classData,1,[]); this.$set(this.classData,1,[]);
if(this.weigh.length!=0){ if(this.weigh.length!=0){
...@@ -264,9 +253,7 @@ ...@@ -264,9 +253,7 @@
}, },
bindData(e){ bindData(e){
let that = this let that = this
console.log(e)
if(e.detail.value[0] == 0){ if(e.detail.value[0] == 0){
console.log(that.ordinary.length,'左边')
if(that.ordinary.length != 0){ if(that.ordinary.length != 0){
that.linkage_id = that.ordinary[e.detail.value[1]].product_id that.linkage_id = that.ordinary[e.detail.value[1]].product_id
that.product_id = that.ordinary[e.detail.value[1]].product_id that.product_id = that.ordinary[e.detail.value[1]].product_id
...@@ -279,7 +266,7 @@ ...@@ -279,7 +266,7 @@
return false; return false;
} }
}else{ }else{
console.log(that.weigh.length,'右边')
if(that.weigh.length != 0){ if(that.weigh.length != 0){
that.linkage_id = that.weigh[e.detail.value[1]].product_id that.linkage_id = that.weigh[e.detail.value[1]].product_id
that.product_id = that.weigh[e.detail.value[1]].product_id that.product_id = that.weigh[e.detail.value[1]].product_id
...@@ -294,7 +281,6 @@ ...@@ -294,7 +281,6 @@
} }
that.eleProductInfofun(); that.eleProductInfofun();
this.is_datashow = false; this.is_datashow = false;
console.log(this.is_datashow)
}, },
...@@ -409,15 +395,14 @@ ...@@ -409,15 +395,14 @@
}) })
}, },
fail:(err)=>{ fail:(err)=>{
console.log(err)
} }
}); });
}, },
radioChange(e){ radioChange(e){
// console.log(this.isType)
this.form.sell_type = e.detail.value this.form.sell_type = e.detail.value
console.log(this.form.sell_type)
}, },
radioChanges(e){ radioChanges(e){
...@@ -433,7 +418,6 @@ ...@@ -433,7 +418,6 @@
}, },
confirm(e){ confirm(e){
console.log(e)
this.cate_name = e.item.cate_name; this.cate_name = e.item.cate_name;
this.form.cate_id =e.item.cate_id; this.form.cate_id =e.item.cate_id;
this.index = e.index; this.index = e.index;
...@@ -449,7 +433,6 @@ ...@@ -449,7 +433,6 @@
}, },
//分类选中 //分类选中
bindPickerChange(e){ bindPickerChange(e){
console.info(e.detail.value);
this.cate_name = this.chindformList[e.detail.value].cate_name; this.cate_name = this.chindformList[e.detail.value].cate_name;
this.form.cate_id = this.chindformList[e.detail.value].cate_id; this.form.cate_id = this.chindformList[e.detail.value].cate_id;
this.index = e.detail.value; this.index = e.detail.value;
...@@ -471,8 +454,7 @@ ...@@ -471,8 +454,7 @@
async eleProductInfofun(){ async eleProductInfofun(){
let res = await eleProductInfo({ let res = await eleProductInfo({
product_id:this.product_id, product_id:this.product_id,
}); });
// console.log(res,'法大师傅大师傅大师傅士大夫大师傅');
if(res.code==0){ if(res.code==0){
this.linkage_product_id = res.data.linkage_product_id this.linkage_product_id = res.data.linkage_product_id
this.bools = res.data.product_name; this.bools = res.data.product_name;
...@@ -531,21 +513,18 @@ ...@@ -531,21 +513,18 @@
} }
}) })
}else if(res.data.commodity_type == 'weigh'){ }else if(res.data.commodity_type == 'weigh'){
console.log(res.data.commodity_type,585555555555555555555555)
this.weigh.map(item=>{ this.weigh.map(item=>{
if(this.linkage_product_id == item.product_id){ if(this.linkage_product_id == item.product_id){
this.classValue = item.product_name this.classValue = item.product_name
console.log(this.classValue,item.product_name)
} }
console.log(this.classValue)
}) })
}else{ }else{
this.classValue = ''; this.classValue = '';
} }
console.log(this.classValue)
//属性选默认值 //属性选默认值
if(res.data.is_new==1){ if(res.data.is_new==1){
...@@ -596,7 +575,6 @@ ...@@ -596,7 +575,6 @@
// quality_guarantee_period = this.qualitYears*365 + this.qualityMonths*30 + this.qualityDays // quality_guarantee_period = this.qualitYears*365 + this.qualityMonths*30 + this.qualityDays
// console.log(this.qualitYears*365+this.qualityMonths*30+this.qualityDays*1)
// if(this.c_pics.length == 0){ // if(this.c_pics.length == 0){
// this.$api.msg('产品图片未上传'); // this.$api.msg('产品图片未上传');
...@@ -642,11 +620,9 @@ ...@@ -642,11 +620,9 @@
}) })
// if(this.stockType==1){ // if(this.stockType==1){
// console.log(this.stockType,1111111111)
// can.stock = this.stock_number // can.stock = this.stock_number
// }else{ // }else{
// can.stock = '-'+this.stock_number // can.stock = '-'+this.stock_number
// console.log(this.stockType,1111111111)
// } // }
...@@ -664,11 +640,8 @@ ...@@ -664,11 +640,8 @@
can.action = "edit"; can.action = "edit";
can.product_id = this.product_id; can.product_id = this.product_id;
} }
//添加修改外卖产品 //添加修改外卖产品
console.log('这里了')
addEditEleProduct(can).then((res1)=>{ addEditEleProduct(can).then((res1)=>{
console.log(can)
console.log(res1)
if(res1.code==0){ if(res1.code==0){
this.$api.msg(res1.msg); this.$api.msg(res1.msg);
setTimeout(()=>{ setTimeout(()=>{
...@@ -684,7 +657,6 @@ ...@@ -684,7 +657,6 @@
}, },
pickerChange(e){ pickerChange(e){
console.log(e)
this.form.activity_id = this.seckilltimelist[e.detail.value[0]].activity_id; this.form.activity_id = this.seckilltimelist[e.detail.value[0]].activity_id;
}, },
// 秒杀列表 // 秒杀列表
...@@ -713,8 +685,7 @@ ...@@ -713,8 +685,7 @@
return obj%1 === 0; return obj%1 === 0;
}, },
//图片上传 //图片上传
c_delImage(e) { c_delImage(e) {
// console.log(e,'反对发射点')
let arr = [] let arr = []
for (let k in e.allImages) { for (let k in e.allImages) {
arr[k] = e.allImages[k].id arr[k] = e.allImages[k].id
...@@ -731,8 +702,7 @@ ...@@ -731,8 +702,7 @@
} }
}, },
onMove_c(e) { onMove_c(e) {
this.c_pics = e; this.c_pics = e;
// console.log(e,'反对法地方')
const obj = e const obj = e
for (let index in obj) { for (let index in obj) {
let id = obj[index].data let id = obj[index].data
......
...@@ -174,7 +174,6 @@ ...@@ -174,7 +174,6 @@
this.$refs.picker.show() // 显示 this.$refs.picker.show() // 显示
}, },
bindPickerChange1(e){ //选择分类 bindPickerChange1(e){ //选择分类
console.log(e)
this.cate_name = e.item.name; this.cate_name = e.item.name;
this.parameter.type = e.item.id; this.parameter.type = e.item.id;
this.index = e.index; this.index = e.index;
...@@ -185,7 +184,6 @@ ...@@ -185,7 +184,6 @@
room_id:this.room_id, room_id:this.room_id,
}); });
if(res.code==0){ if(res.code==0){
console.log(res)
this.parameter = { this.parameter = {
action:"edit",// add添加,edit修改 action:"edit",// add添加,edit修改
//酒店的信息 //酒店的信息
...@@ -248,7 +246,7 @@ ...@@ -248,7 +246,7 @@
this.cate_name = this.typeList[0].name; this.cate_name = this.typeList[0].name;
}else{ //修改信息 }else{ //修改信息
console.log(this.room_id)
} }
......
...@@ -137,10 +137,8 @@ ...@@ -137,10 +137,8 @@
// is_dianping: "", //点评 // is_dianping: "", //点评
// sale_status: "" //售后状态 // sale_status: "" //售后状态
// }).then(res => { // }).then(res => {
// console.log(res, order_id, '这里了')
// uni.hideLoading(); // uni.hideLoading();
// for (let item of res.data) { // for (let item of res.data) {
// console.log(item, '这里了')
// if (item.order_id == order_id) { // if (item.order_id == order_id) {
// this.$set(this.orderlist, index, item); // this.$set(this.orderlist, index, item);
// break; // break;
......
...@@ -327,7 +327,6 @@ ...@@ -327,7 +327,6 @@
} }
// #endif // #endif
// console.info("url",url);
return url; return url;
} catch (err) { } catch (err) {
return "/static/chat/imgloaderr.png"; return "/static/chat/imgloaderr.png";
...@@ -450,14 +449,13 @@ ...@@ -450,14 +449,13 @@
try{ try{
//获取设备信息 //获取设备信息
let resinfo = uni.getSystemInfoSync(); let resinfo = uni.getSystemInfoSync();
console.info(resinfo,"resinfo");
let windowHeight = resinfo.windowHeight;//可使用窗口高度 768 let windowHeight = resinfo.windowHeight;//可使用窗口高度 768
//上面的是95 下面的是56 //上面的是95 下面的是56
//上面44 下面 42 //上面44 下面 42
let scrollheight = windowHeight-44-43-resinfo.statusBarHeight; let scrollheight = windowHeight-44-43-resinfo.statusBarHeight;
this.scrollheight = scrollheight;//可滑动区域的高度 计算出来是 this.scrollheight = scrollheight;//可滑动区域的高度 计算出来是
}catch(error){ }catch(error){
console.error("error",error);
} }
setTimeout(() => { setTimeout(() => {
...@@ -520,7 +518,6 @@ ...@@ -520,7 +518,6 @@
methods: { methods: {
//图片加载完成 //图片加载完成
loadimgbefor(){ loadimgbefor(){
// console.info('图片加载完成');
this.ToTheBottom(); this.ToTheBottom();
}, },
//发送快捷语 //发送快捷语
...@@ -599,7 +596,7 @@ ...@@ -599,7 +596,7 @@
}, },
//页面置底 //页面置底
ToTheBottom() { ToTheBottom() {
console.info("置底");
// this.$nextTick(() => { // this.$nextTick(() => {
// // dom元素更新后执行,因此这里能正确打印更改之后的值 // // dom元素更新后执行,因此这里能正确打印更改之后的值
// let curRoute = this.$mp.page.route; // let curRoute = this.$mp.page.route;
...@@ -609,7 +606,6 @@ ...@@ -609,7 +606,6 @@
// duration: 0 // duration: 0
// }); // });
// }else{ // }else{
// console.info("不在当前页面了 不能置底");
// } // }
// }) // })
...@@ -619,11 +615,9 @@ ...@@ -619,11 +615,9 @@
view.boundingClientRect((data)=> { view.boundingClientRect((data)=> {
//获取固定尾部的高度=data.height //获取固定尾部的高度=data.height
// that.style.footViewHeight = data.height // that.style.footViewHeight = data.height
// console.info(" data.height", data.height);
if(data){ if(data){
this.scrollTop = data.height+460; this.scrollTop = data.height+460;
}else{ }else{
console.info("加载快了");
this.scrollTop = 999999999; this.scrollTop = 999999999;
} }
...@@ -842,7 +836,6 @@ ...@@ -842,7 +836,6 @@
}, },
//查看订单 //查看订单
toorderinfo() { toorderinfo() {
console.info('查看订单详情');
let order_id = this.groupInfodata.customInfo.order_id; let order_id = this.groupInfodata.customInfo.order_id;
let order_type = this.groupInfodata.customInfo.order_type; let order_type = this.groupInfodata.customInfo.order_type;
let tourl = ""; let tourl = "";
......
...@@ -91,7 +91,6 @@ ...@@ -91,7 +91,6 @@
watch:{ watch:{
conversationList: { conversationList: {
  handler(newName, oldName) {   handler(newName, oldName) {
console.info("conversationList 监听ooo");
let {conversationList} = this; let {conversationList} = this;
this.conversationListtwo = conversationList; this.conversationListtwo = conversationList;
this.handchangelist(); this.handchangelist();
...@@ -127,7 +126,6 @@ ...@@ -127,7 +126,6 @@
//获取会话列表 APP //获取会话列表 APP
getConversationList() { getConversationList() {
this.$store.dispatch("getConversationList", {}).then((res)=>{ this.$store.dispatch("getConversationList", {}).then((res)=>{
// console.info("APP获取会话列表成功",res);
}); //获取会话列表 }); //获取会话列表
}, },
tochats(item) { tochats(item) {
......
...@@ -99,7 +99,6 @@ ...@@ -99,7 +99,6 @@
}); });
}, },
send() { //发送反馈 send() { //发送反馈
console.log(JSON.stringify(this.sendDate));
let imgs = this.imageList.map((value, index) => { let imgs = this.imageList.map((value, index) => {
return { return {
name: "image" + index, name: "image" + index,
......
...@@ -111,7 +111,6 @@ ...@@ -111,7 +111,6 @@
}) })
//isipc = isipc.join(";"); //isipc = isipc.join(";");
isipc = isipc.join(","); isipc = isipc.join(",");
console.info(isipc,"111");
let res = await storeCertificate({ let res = await storeCertificate({
......
...@@ -78,7 +78,6 @@ ...@@ -78,7 +78,6 @@
} }
}, },
onLoad(opdata) { onLoad(opdata) {
console.info(opdata)
this.money_type=opdata.money_type; this.money_type=opdata.money_type;
this.activity_type = opdata.activity_type//秒杀资格判断 this.activity_type = opdata.activity_type//秒杀资格判断
...@@ -127,7 +126,6 @@ ...@@ -127,7 +126,6 @@
}); });
if(res.code==0){ if(res.code==0){
console.log(res);
if(res.data.length!=0){ if(res.data.length!=0){
this.goodsListdata = [...this.goodsListdata,...res.data]; this.goodsListdata = [...this.goodsListdata,...res.data];
...@@ -313,7 +311,6 @@ ...@@ -313,7 +311,6 @@
}, },
//活动抽奖选择商品 //活动抽奖选择商品
Selectiondata(data){ Selectiondata(data){
console.info(data);
//选择商品卡回调 //选择商品卡回调
if(this.isselect==1){ if(this.isselect==1){
......
...@@ -362,20 +362,17 @@ ...@@ -362,20 +362,17 @@
//打开分类选择 //打开分类选择
opencatesel(){ opencatesel(){
this.$refs.auipicker.open().then(() =>{ this.$refs.auipicker.open().then(() =>{
console.log('picker打开');
}); });
}, },
pickerCallback(e){ pickerCallback(e){
console.info("分类选择完成e",e);
let len = e.data.length; let len = e.data.length;
this.parent_name = e.data[len-1].name; this.parent_name = e.data[len-1].name;
this.canform.cate_id = e.data[len-1].id; this.canform.cate_id = e.data[len-1].id;
console.info("选中的id",e.data[len-1].id);
}, },
//是否推荐 //是否推荐
changetuijian(e) { changetuijian(e) {
console.info(e, "eee");
if (e.target.value.indexOf("1") != -1) { //选中了 if (e.target.value.indexOf("1") != -1) { //选中了
this.canform.is_tuijian = "1"; this.canform.is_tuijian = "1";
} else { } else {
...@@ -403,10 +400,6 @@ ...@@ -403,10 +400,6 @@
}); });
if (res.code == 0) { if (res.code == 0) {
console.log("-------------------------------------------")
console.log(res,"商品详情66")
console.log("-------------------------------------------")
this.isjiumodelshop = res.data; //赋值 this.isjiumodelshop = res.data; //赋值
this.canform.title = res.data.title; this.canform.title = res.data.title;
...@@ -442,14 +435,12 @@ ...@@ -442,14 +435,12 @@
let itemsan = itemtwo.children[k] let itemsan = itemtwo.children[k]
if(itemsan.cate_id==this.canform.cate_id){ if(itemsan.cate_id==this.canform.cate_id){
console.info("找到名字了",itemsan.cate_name);
this.parent_name = itemsan.cate_name; //二级名称 this.parent_name = itemsan.cate_name; //二级名称
break; break;
} }
} }
}else{ }else{
if(itemtwo.cate_id==this.canform.cate_id){ if(itemtwo.cate_id==this.canform.cate_id){
console.info("找到名字了",itemtwo.cate_name);
this.parent_name = itemtwo.cate_name; //二级名称 this.parent_name = itemtwo.cate_name; //二级名称
break; break;
} }
...@@ -539,7 +530,7 @@ ...@@ -539,7 +530,7 @@
let res = await getGoodsCate({ let res = await getGoodsCate({
}) })
console.info(res,"商城分类~~"); //"商城分类~~");
if (res.code == 0) { if (res.code == 0) {
this.goodsCate = res.data.goodsCate; //二级商品分类 this.goodsCate = res.data.goodsCate; //二级商品分类
this.shopCate = res.data.shopCate; //商家分类 this.shopCate = res.data.shopCate; //商家分类
...@@ -570,15 +561,11 @@ ...@@ -570,15 +561,11 @@
}, },
//富文本处理完毕 事件 获取最后的html 数据 子组件调用的 //富文本处理完毕 事件 获取最后的html 数据 子组件调用的
editOk(e) { //2.xxxx editOk(e) { //2.xxxx
console.info("col666", e.html);
//调用完毕 调用 create_goods //调用完毕 调用 create_goods
let htaltag = e.html let htaltag = e.html
let newStr = htaltag.replace(new RegExp(/\"/g), ""); let newStr = htaltag.replace(new RegExp(/\"/g), "");
// console.log(newStr);
this.canform.details = newStr; //e.html this.canform.details = newStr; //e.html
console.info("this.canform.details",this.canform.details);
this.create_goods(); this.create_goods();
}, },
...@@ -602,7 +589,6 @@ ...@@ -602,7 +589,6 @@
this.canform.photos = this.c_photosTwo.join(";"); //更多详情图 列表 this.canform.photos = this.c_photosTwo.join(";"); //更多详情图 列表
} }
let selchildList = this.selchildList; let selchildList = this.selchildList;
console.log(selchildList)
selchildList.forEach((item, index) => { //勾选的两个 selchildList.forEach((item, index) => { //勾选的两个
if (item == "is_new") { if (item == "is_new") {
this.canform.is_new = "1"; this.canform.is_new = "1";
...@@ -612,8 +598,6 @@ ...@@ -612,8 +598,6 @@
} }
}) })
//添加 //添加
console.log(this.canform.mall_price)
console.log(this.canform.price)
if (parseFloat(this.canform.price) < parseFloat(this.canform.mall_price)) { if (parseFloat(this.canform.price) < parseFloat(this.canform.mall_price)) {
this.$api.msg('商城价格不能大于市场价格'); this.$api.msg('商城价格不能大于市场价格');
...@@ -624,14 +608,8 @@ ...@@ -624,14 +608,8 @@
this.canform.is_member = parseInt(this.canform.is_member); this.canform.is_member = parseInt(this.canform.is_member);
this.canform.is_discount = parseInt(this.canform.is_discount); this.canform.is_discount = parseInt(this.canform.is_discount);
this.canform.market_price = this.canform.price;//... this.canform.market_price = this.canform.price;//...
console.info("i", this.canform);
console.info("this.canform.is_tuijian", this.canform.is_tuijian);
let res = await addEditGoods(this.canform) let res = await addEditGoods(this.canform)
console.info("res", res);
this.issubmit = true; this.issubmit = true;
if (res.code == 0) { if (res.code == 0) {
...@@ -652,13 +630,11 @@ ...@@ -652,13 +630,11 @@
}, },
//多选 勾选 列表 //多选 勾选 列表
checkboxChange(e) { checkboxChange(e) {
console.log(this.canform.activity_list)
this.selchildList = e.detail.value; this.selchildList = e.detail.value;
}, },
// 改变下拉选项 一级的 // 改变下拉选项 一级的
//商城分类 //商城分类
bindPickerChange(event) { bindPickerChange(event) {
console.info(event.detail.value);
this.catindex = event.detail.value; this.catindex = event.detail.value;
this.shopcate_name = this.shopCateData[event.detail.value].cate_name; this.shopcate_name = this.shopCateData[event.detail.value].cate_name;
this.canform.shopcate_id = this.shopCateData[event.detail.value].cate_id; this.canform.shopcate_id = this.shopCateData[event.detail.value].cate_id;
...@@ -672,14 +648,12 @@ ...@@ -672,14 +648,12 @@
this.c_photos = arr this.c_photos = arr
}, },
c_onImg(e) { c_onImg(e) {
console.info(e);
this.c_pics = e.allImages this.c_pics = e.allImages
const obj = e.allImages const obj = e.allImages
for (let index in obj) { for (let index in obj) {
let id = obj[index].data let id = obj[index].data
this.c_photos[index] = id this.c_photos[index] = id
} }
console.log(this.c_photos)
}, },
onMove_c(e) { onMove_c(e) {
this.c_pics = e this.c_pics = e
......
...@@ -142,7 +142,6 @@ ...@@ -142,7 +142,6 @@
//获取之前设置过的信息 //获取之前设置过的信息
this.getshopDetail(); this.getshopDetail();
this.list2=timeList.list; this.list2=timeList.list;
console.log(timeList)
}, },
components: { components: {
uniIcon, uniIcon,
...@@ -214,10 +213,7 @@ ...@@ -214,10 +213,7 @@
name: 'img', name: 'img',
formData: this.uploaddata, formData: this.uploaddata,
success: (uploadFileRes) => { success: (uploadFileRes) => {
console.log(uploadFileRes.data, "上传成功后~");
let resdata = JSON.parse(uploadFileRes.data); let resdata = JSON.parse(uploadFileRes.data);
console.info(resdata, "resdata");
this.fromdata.logo = resdata.data; this.fromdata.logo = resdata.data;
} }
...@@ -255,11 +251,9 @@ ...@@ -255,11 +251,9 @@
this.editortel=true; this.editortel=true;
}, },
modifyTime(){//点击编辑营业时间 modifyTime(){//点击编辑营业时间
console.log('点击了');
this.$refs.picker.show() // 显示 this.$refs.picker.show() // 显示
}, },
confirm(e){ confirm(e){
console.log(e.item[0].label,e.item[1].label)
this.fromdata.business_time = e.item[0].label+'-'+e.item[1].label; //营业时间 需要特殊处理 this.fromdata.business_time = e.item[0].label+'-'+e.item[1].label; //营业时间 需要特殊处理
this.addNewStoreFun(); //修改信息 this.addNewStoreFun(); //修改信息
...@@ -280,7 +274,6 @@ ...@@ -280,7 +274,6 @@
chooseLocation() { chooseLocation() {
uni.chooseLocation({ uni.chooseLocation({
success: (data) => { success: (data) => {
console.log(data,'fdfs')
qqmapsdk.reverseGeocoder({ qqmapsdk.reverseGeocoder({
location: { location: {
latitude: data.latitude, latitude: data.latitude,
...@@ -293,12 +286,12 @@ ...@@ -293,12 +286,12 @@
this.addNewStoreFun(); //修改信息 this.addNewStoreFun(); //修改信息
}, },
fail: (err)=>{ fail: (err)=>{
console.log(err)
} }
}) })
}, },
fail: (err)=>{ fail: (err)=>{
console.log(err)
} }
}); });
}, },
...@@ -313,7 +306,6 @@ ...@@ -313,7 +306,6 @@
}, },
onEditorReady(data) { onEditorReady(data) {
uni.createSelectorQuery().select('#editor').context((res) => { uni.createSelectorQuery().select('#editor').context((res) => {
console.log(res)
this.editorCtx = res.context; this.editorCtx = res.context;
let content = { let content = {
html: data html: data
......
...@@ -214,7 +214,6 @@ ...@@ -214,7 +214,6 @@
this.edit = opdata.edit this.edit = opdata.edit
console.log(this.edit)
this.activity_type = opdata.activity_type this.activity_type = opdata.activity_type
if(opdata.isselect==1){ if(opdata.isselect==1){
...@@ -225,8 +224,7 @@ ...@@ -225,8 +224,7 @@
} }
}, },
onShow() { onShow() {
// console.log(this.$refs.popup)
this.goods_list = []; this.goods_list = [];
this.page = 1; this.page = 1;
this.isallshow=false; this.isallshow=false;
...@@ -265,13 +263,9 @@ ...@@ -265,13 +263,9 @@
}, },
inputkeys(){ inputkeys(){
this.isScanCode = '' this.isScanCode = ''
console.log(this.isScanCode)
console.log('asdadasdadadadsada');
}, },
searchProduct(){ searchProduct(){
console.log(this.keywords)
let son = '' let son = ''
if(this.edit == 1){ if(this.edit == 1){
son = '' son = ''
...@@ -284,7 +278,6 @@ ...@@ -284,7 +278,6 @@
son:son, son:son,
}).then(res=>{ }).then(res=>{
if(res.code == 0){ if(res.code == 0){
// console.log(res.data)
this.isSearch = false this.isSearch = false
if(res.data.length == 0){ if(res.data.length == 0){
this.$api.msg('没有找到此商品') this.$api.msg('没有找到此商品')
...@@ -300,18 +293,15 @@ ...@@ -300,18 +293,15 @@
success: (res) => { success: (res) => {
this.isScanCode = 1 this.isScanCode = 1
this.keywords = res.result this.keywords = res.result
console.log(this.keywords)
console.log(this.isScanCode)
this.searchProduct() this.searchProduct()
}, },
fail: (err) => { fail: (err) => {
console.log(res.err)
} }
}) })
}, },
addeleproduct(){ addeleproduct(){
console.log('外卖')
// :url="'/pages/addEditEleProduct/addEditEleProduct?activity_type='+activity_type+'&isadd=0' " // :url="'/pages/addEditEleProduct/addEditEleProduct?activity_type='+activity_type+'&isadd=0' "
uni.navigateTo({ uni.navigateTo({
url:"'/pages/addEditEleProduct/addEditEleProduct?activity_type="+this.activity_type+'&isadd=0' url:"'/pages/addEditEleProduct/addEditEleProduct?activity_type="+this.activity_type+'&isadd=0'
...@@ -386,8 +376,6 @@ ...@@ -386,8 +376,6 @@
// if(this.page==0){ // if(this.page==0){
// this.count = res.data.count; // this.count = res.data.count;
// } // }
console.log(res.data)
console.log(res.data.length)
if(res.data!=[] && res.data.length!=0){ if(res.data!=[] && res.data.length!=0){
let data = res.data; let data = res.data;
data = data.map((item,index)=>{ data = data.map((item,index)=>{
...@@ -455,7 +443,6 @@ ...@@ -455,7 +443,6 @@
this.goods_product_list(); this.goods_product_list();
}, },
checkboxChange(e){//单选事件 列表 checkboxChange(e){//单选事件 列表
console.info(e.detail.value);
this.idArr = e.detail.value; this.idArr = e.detail.value;
}, },
...@@ -478,22 +465,17 @@ ...@@ -478,22 +465,17 @@
}, },
radioChange(e){//全选 反选 radioChange(e){//全选 反选
console.info(e);
this.isallchind = !this.isallchind; this.isallchind = !this.isallchind;
if(e.detail.value.length==0){ if(e.detail.value.length==0){
console.log("反选");
this.taggledata(2) this.taggledata(2)
}else{ }else{
this.taggledata(1) this.taggledata(1)
console.log("全选");
} }
}, },
//活动抽奖选择商品 //活动抽奖选择商品
Selectiondata(data){ Selectiondata(data){
console.info(data);
//选择商品卡回调 //选择商品卡回调
if(this.isselect==1){ if(this.isselect==1){
uni.setStorageSync('selectaddres', {data,sendindex:this.sendindex});//存 uni.setStorageSync('selectaddres', {data,sendindex:this.sendindex});//存
......
...@@ -107,7 +107,6 @@ ...@@ -107,7 +107,6 @@
}); });
}, },
send() { //发送反馈 send() { //发送反馈
console.log(JSON.stringify(this.sendDate));
let imgs = this.imageList.map((value, index) => { let imgs = this.imageList.map((value, index) => {
return { return {
name: "image" + index, name: "image" + index,
...@@ -144,7 +143,6 @@ ...@@ -144,7 +143,6 @@
// title: "失败", // title: "失败",
// icon:"none" // icon:"none"
// }); // });
// console.log(res)
// } // }
// }); // });
} }
......
...@@ -105,7 +105,6 @@ ...@@ -105,7 +105,6 @@
this.projuctList.forEach((item,index)=>{ this.projuctList.forEach((item,index)=>{
Provalcate.push(String(item.cate_id)) Provalcate.push(String(item.cate_id))
}) })
console.info("Provalcate",Provalcate);
if(Provalcate.length!=0){ if(Provalcate.length!=0){
this.ProAllChecked = false; this.ProAllChecked = false;
} }
...@@ -113,7 +112,6 @@ ...@@ -113,7 +112,6 @@
let cateVal =[]; let cateVal =[];
this.categorylist = this.categorylist.map((item,index)=>{ this.categorylist = this.categorylist.map((item,index)=>{
if(Provalcate.indexOf(item.cate_id)!=-1){ if(Provalcate.indexOf(item.cate_id)!=-1){
console.info("符合~",index);
item.checked = true;//选中状态 默认没有选中 item.checked = true;//选中状态 默认没有选中
cateVal.push(item.cate_id) cateVal.push(item.cate_id)
...@@ -294,7 +292,6 @@ ...@@ -294,7 +292,6 @@
} }
}) })
this.projuctList =projuctList; this.projuctList =projuctList;
console.info("Provalcate",Provalcate);
if(Provalcate.length!=0){ if(Provalcate.length!=0){
this.ProAllChecked = false; this.ProAllChecked = false;
} }
...@@ -302,7 +299,6 @@ ...@@ -302,7 +299,6 @@
// let cateVal =[]; // let cateVal =[];
// this.categorylist = this.categorylist.map((item,index)=>{ // this.categorylist = this.categorylist.map((item,index)=>{
// if(Provalcate.indexOf(item.cate_id)!=-1){ // if(Provalcate.indexOf(item.cate_id)!=-1){
// console.info("符合~",index);
// item.checked = true;//选中状态 默认没有选中 // item.checked = true;//选中状态 默认没有选中
// cateVal.push(item.cate_id) // cateVal.push(item.cate_id)
......
...@@ -116,7 +116,6 @@ ...@@ -116,7 +116,6 @@
this.gethotelStatus(); this.gethotelStatus();
}, },
onReachBottom(){ onReachBottom(){
console.log("11");
if(!this.isallshow){ if(!this.isallshow){
this.shopHotelfun(); this.shopHotelfun();
......
...@@ -174,7 +174,6 @@ ...@@ -174,7 +174,6 @@
let res = await hotelOrderDetails({ let res = await hotelOrderDetails({
order_id:this.order_id, order_id:this.order_id,
}); });
console.log(res);
if(res.code==0){ if(res.code==0){
...@@ -201,7 +200,6 @@ ...@@ -201,7 +200,6 @@
latitude: parseFloat(this.hotel.lat), latitude: parseFloat(this.hotel.lat),
longitude: parseFloat(this.hotel.lng), longitude: parseFloat(this.hotel.lng),
success: ()=> { success: ()=> {
console.log('success');
} }
}); });
} }
......
...@@ -410,7 +410,6 @@ ...@@ -410,7 +410,6 @@
// uni.stopPullDownRefresh();//结束下拉刷新 // uni.stopPullDownRefresh();//结束下拉刷新
}, },
onShow() { onShow() {
// console.log(uni.getStorageSync("token"),"token");
//检测更新 //检测更新
setTimeout(() => { setTimeout(() => {
// #ifdef APP-PLUS // #ifdef APP-PLUS
...@@ -482,7 +481,6 @@ ...@@ -482,7 +481,6 @@
let param = this.GetRequest(res.result); let param = this.GetRequest(res.result);
// param.shop_id = 81 // param.shop_id = 81
if (param.type == 10) { // 菜市场买菜核销 if (param.type == 10) { // 菜市场买菜核销
console.log(param);
ele_carry(param).then(res=>{ ele_carry(param).then(res=>{
if(res.code == 0){ if(res.code == 0){
uni.showToast({ uni.showToast({
...@@ -601,9 +599,7 @@ ...@@ -601,9 +599,7 @@
}) })
} }
}); });
console.log('用户点击确定');
} else if (res.cancel) { } else if (res.cancel) {
console.log('用户点击取消');
} }
} }
...@@ -618,7 +614,6 @@ ...@@ -618,7 +614,6 @@
//获取首页的数据 //获取首页的数据
async storeIndexfun() { async storeIndexfun() {
let res = await storeIndex({}); let res = await storeIndex({});
console.info("res",res);
uni.stopPullDownRefresh(); //结束下拉刷新 uni.stopPullDownRefresh(); //结束下拉刷新
if (res.code == 0) { if (res.code == 0) {
this.countdata = res.data.counts; //统计的数据 this.countdata = res.data.counts; //统计的数据
...@@ -629,7 +624,6 @@ ...@@ -629,7 +624,6 @@
let service_tel = res.data.service_tel; let service_tel = res.data.service_tel;
uni.setStorageSync("service_tel",service_tel);//客服电话 uni.setStorageSync("service_tel",service_tel);//客服电话
console.info(service_tel,"service_tel");
} else { } else {
this.$api.msg(res.msg); this.$api.msg(res.msg);
......
...@@ -71,7 +71,6 @@ ...@@ -71,7 +71,6 @@
}, },
methods: { methods: {
getRidingRouteFun(){ getRidingRouteFun(){
console.log(this.longitude+','+this.latitude)
Amap.getRidingRoute({ Amap.getRidingRoute({
origin:this.longitude+','+this.latitude, origin:this.longitude+','+this.latitude,
destination: this.destination, destination: this.destination,
......
...@@ -125,7 +125,6 @@ ...@@ -125,7 +125,6 @@
//获取之前记录的密码 //获取之前记录的密码
let username = uni.getStorageSync("username"); let username = uni.getStorageSync("username");
let password = uni.getStorageSync("password"); let password = uni.getStorageSync("password");
//console.info(username,password,"password");
if(username!="" && username!=undefined){ if(username!="" && username!=undefined){
this.username = username; this.username = username;
} }
...@@ -166,7 +165,6 @@ ...@@ -166,7 +165,6 @@
methods: { methods: {
//单选框 //单选框
radioChange(e){ radioChange(e){
console.log(e);
this.isAgree = !this.isAgree; this.isAgree = !this.isAgree;
}, },
...@@ -223,7 +221,6 @@ ...@@ -223,7 +221,6 @@
cID = plus.push.getClientInfo(); cID = plus.push.getClientInfo();
// #endif // #endif
console.log(cID,"cID");
if(cID==null){ if(cID==null){
cID = {}; cID = {};
} }
...@@ -241,7 +238,6 @@ ...@@ -241,7 +238,6 @@
password:this.password, password:this.password,
cid : cID.clientid?cID.clientid:'' cid : cID.clientid?cID.clientid:''
}); });
// console.info('resaa1',res);
// this.$api.msg(res); // this.$api.msg(res);
if(res.code==0){ if(res.code==0){
...@@ -335,7 +331,6 @@ ...@@ -335,7 +331,6 @@
}, },
//记住密码 //记住密码
changegroup(e){ changegroup(e){
console.info(e.detail.value.length);
if(e.detail.value.length==0){ if(e.detail.value.length==0){
this.ischecked = false; this.ischecked = false;
}else{ }else{
......
...@@ -108,7 +108,6 @@ ...@@ -108,7 +108,6 @@
var reg = /[0-9]+(\.?[0-9]+)?\%?/g; var reg = /[0-9]+(\.?[0-9]+)?\%?/g;
let str = value;//'恭喜您再获得3999上市股票'; let str = value;//'恭喜您再获得3999上市股票';
str = str.replace(reg,"<span style='font-size: 48upx;font-weight: bold;'> $& </span>"); str = str.replace(reg,"<span style='font-size: 48upx;font-weight: bold;'> $& </span>");
console.log(str)
return str; return str;
} }
}, },
...@@ -194,7 +193,6 @@ ...@@ -194,7 +193,6 @@
type, type,
bgScale bgScale
}) => { }) => {
console.info(`--------------${bgObj.width}---------------`);
const dx = bgObj.width * 0.3; const dx = bgObj.width * 0.3;
const fontSize = bgObj.width * 0.045; const fontSize = bgObj.width * 0.045;
const lineHeight = bgObj.height * 0.04; const lineHeight = bgObj.height * 0.04;
......
...@@ -48,7 +48,6 @@ ...@@ -48,7 +48,6 @@
} }
}, },
onLoad(opdata) { onLoad(opdata) {
console.log(opdata)
this.order_id = opdata.order_id; this.order_id = opdata.order_id;
this.shop_id = opdata.shop_id; this.shop_id = opdata.shop_id;
this.logisticsList(); this.logisticsList();
...@@ -103,15 +102,12 @@ ...@@ -103,15 +102,12 @@
}, },
//请求end //请求end
bindPickerChange(e){ bindPickerChange(e){
console.log(e.detail.value);
this.chindtext = this.logsitslist[e.detail.value]; this.chindtext = this.logsitslist[e.detail.value];
}, },
//扫码方法 //扫码方法
tosaoyisao(){ tosaoyisao(){
uni.scanCode({ uni.scanCode({
success: (res)=> { success: (res)=> {
console.log('条码类型:' + res.scanType);
console.log('条码内容:' + res.result);
// let qrcodecon = // let qrcodecon =
......
...@@ -90,7 +90,6 @@ ...@@ -90,7 +90,6 @@
}, },
//监听滚动 //监听滚动
onPageScroll(e){ onPageScroll(e){
//console.log(e.scrollTop);
//处理返回顶部 //处理返回顶部
if(e.scrollTop>400){ if(e.scrollTop>400){
this.isshowtop = true; this.isshowtop = true;
......
...@@ -68,12 +68,10 @@ ...@@ -68,12 +68,10 @@
}, },
onLoad(options) { onLoad(options) {
this.refund_id = options.refund_id; this.refund_id = options.refund_id;
// console.log(this.refund_id)
this.logisticsListfun(); this.logisticsListfun();
}, },
methods:{ methods:{
confirm(e){ confirm(e){
console.log(e)
this.chindtext=e.value; this.chindtext=e.value;
}, },
pickerone(){ pickerone(){
...@@ -122,18 +120,13 @@ ...@@ -122,18 +120,13 @@
}, },
//请求end //请求end
bindPickerChange(e){ bindPickerChange(e){
console.log(e.detail.value,'哈哈哈');
this.chindtext = this.logsitslist[e.detail.value]; this.chindtext = this.logsitslist[e.detail.value];
}, },
//扫码方法 //扫码方法
tosaoyisao(){ tosaoyisao(){
uni.scanCode({ uni.scanCode({
success: (res)=> { success: (res)=> {
console.log('条码类型:' + res.scanType);
console.log('条码内容:' + res.result);
// let qrcodecon = // let qrcodecon =
this.logscode = res.result; this.logscode = res.result;
} }
}); });
......
...@@ -77,7 +77,6 @@ ...@@ -77,7 +77,6 @@
}, },
methods:{ methods:{
confirm(e){ confirm(e){
console.log(e)
this.chindtext=e.value; this.chindtext=e.value;
}, },
pickerone(){ pickerone(){
...@@ -126,15 +125,12 @@ ...@@ -126,15 +125,12 @@
}, },
//请求end //请求end
bindPickerChange(e){ bindPickerChange(e){
console.log(e.detail.value,'哈哈哈');
this.chindtext = this.logsitslist[e.detail.value]; this.chindtext = this.logsitslist[e.detail.value];
}, },
//扫码方法 //扫码方法
tosaoyisao(){ tosaoyisao(){
uni.scanCode({ uni.scanCode({
success: (res)=> { success: (res)=> {
console.log('条码类型:' + res.scanType);
console.log('条码内容:' + res.result);
// let qrcodecon = // let qrcodecon =
......
...@@ -139,7 +139,6 @@ ...@@ -139,7 +139,6 @@
//配置地址: //配置地址:
copeaddress(){ copeaddress(){
let addressdata = `${this.addr.name} ${this.addr.mobile} ${this.addr.addr}`; let addressdata = `${this.addr.name} ${this.addr.mobile} ${this.addr.addr}`;
// console.info(addressdata,"addressdata");
uni.setClipboardData({ uni.setClipboardData({
data: addressdata, data: addressdata,
success: ()=> { success: ()=> {
...@@ -152,7 +151,6 @@ ...@@ -152,7 +151,6 @@
let res = await eleOrderDetails({ let res = await eleOrderDetails({
order_id:this.order_id, order_id:this.order_id,
}); });
console.info("res",res);
if(res.code==0){ if(res.code==0){
......
...@@ -115,7 +115,6 @@ ...@@ -115,7 +115,6 @@
}, },
//标题栏变点击 //标题栏变点击
onNavigationBarButtonTap(e){ onNavigationBarButtonTap(e){
// console.info("eeee",e);
if(e.index==0){ if(e.index==0){
//显示高级搜索 //显示高级搜索
this.isshowsearch = !this.isshowsearch; this.isshowsearch = !this.isshowsearch;
...@@ -183,7 +182,6 @@ ...@@ -183,7 +182,6 @@
methods: { methods: {
//拒绝接单 //拒绝接单
refuse(data){ refuse(data){
console.info(data,"data");
this.refusedata = data; this.refusedata = data;
this.incount = ""; this.incount = "";
this.isshowremarks = true; this.isshowremarks = true;
...@@ -256,7 +254,6 @@ ...@@ -256,7 +254,6 @@
}) })
}, },
reload(e){//抢单成功后 reload(e){//抢单成功后
console.info("重新请求",e);
let index=e.index; let index=e.index;
if(this.status=='all'){ if(this.status=='all'){
this.listDeal(); this.listDeal();
......
...@@ -96,10 +96,10 @@ ...@@ -96,10 +96,10 @@
}, },
methods:{ methods:{
deleteImage: function(e){ deleteImage: function(e){
console.log(e)
}, },
addImage: function(e){ addImage: function(e){
console.log(e)
}, },
} }
} }
......
...@@ -42,7 +42,6 @@ export default { ...@@ -42,7 +42,6 @@ export default {
}, },
onLoad(option){ onLoad(option){
console.log(option)
this.refund_id = option.refund_id; this.refund_id = option.refund_id;
}, },
methods: { methods: {
...@@ -70,7 +69,6 @@ export default { ...@@ -70,7 +69,6 @@ export default {
refund_id: this.refund_id, refund_id: this.refund_id,
} }
shopExamine(params).then(res=>{ shopExamine(params).then(res=>{
// console.log(res)
if(res.code == 0){ if(res.code == 0){
uni.$emit('isDelorder', { action: 'shopExamine' });//监听操作成功后跳回上一页自动刷新列表 uni.$emit('isDelorder', { action: 'shopExamine' });//监听操作成功后跳回上一页自动刷新列表
uni.showToast({ uni.showToast({
......
...@@ -381,7 +381,6 @@ export default { ...@@ -381,7 +381,6 @@ export default {
page: Math.ceil((index + 1) / 20), page: Math.ceil((index + 1) / 20),
pagesize: 20 pagesize: 20
}).then(res => { }).then(res => {
console.log(res);
uni.hideLoading(); //结束加载 uni.hideLoading(); //结束加载
for (let item of res.data) { for (let item of res.data) {
if (item.refund_id == refund_id) { if (item.refund_id == refund_id) {
...@@ -503,7 +502,6 @@ export default { ...@@ -503,7 +502,6 @@ export default {
tel:this.tel, tel:this.tel,
}; };
orderList(params).then(res => { orderList(params).then(res => {
console.info(res,'res');
uni.stopPullDownRefresh(); uni.stopPullDownRefresh();
uni.hideLoading(); //结束加载 uni.hideLoading(); //结束加载
if (res.data == null || res.data.length == 0) { if (res.data == null || res.data.length == 0) {
...@@ -600,9 +598,7 @@ export default { ...@@ -600,9 +598,7 @@ export default {
reject(err); reject(err);
}); });
} }
}) }).then(res => {
.then(res => {
console.info(res,"退款到这里了");
if (res.code == 0) { if (res.code == 0) {
if (this.status != 'all') { if (this.status != 'all') {
let order = this.order; let order = this.order;
...@@ -616,7 +612,6 @@ export default { ...@@ -616,7 +612,6 @@ export default {
} }
}) })
.catch(err => { .catch(err => {
console.log(err, '失败了');
//this.$api.msg(err.msg) //this.$api.msg(err.msg)
}); });
} }
...@@ -722,7 +717,6 @@ export default { ...@@ -722,7 +717,6 @@ export default {
success: res => { success: res => {
if (res.confirm) { if (res.confirm) {
shopExamine(params).then(res => { shopExamine(params).then(res => {
console.info("退款请求",res);
if (res.code == 0) { if (res.code == 0) {
uni.$emit('isDelorder', { action: 'shopExamine' }); uni.$emit('isDelorder', { action: 'shopExamine' });
uni.showToast({ uni.showToast({
......
...@@ -189,7 +189,6 @@ ...@@ -189,7 +189,6 @@
order_id: that.order_id, order_id: that.order_id,
}; };
orderDetails(params).then(res => { orderDetails(params).then(res => {
console.log(res);
if (res.code < 0) { if (res.code < 0) {
// app.showToast({title: res.msg}); // app.showToast({title: res.msg});
this.$api.msg(res.msg); this.$api.msg(res.msg);
...@@ -204,7 +203,6 @@ ...@@ -204,7 +203,6 @@
this.logs = res.data.logs; this.logs = res.data.logs;
this.user_IM_id = res.data.logs.user_IM_id; this.user_IM_id = res.data.logs.user_IM_id;
//this.CONFIG = //this.CONFIG =
console.info(this.user_IM_id,"user_IM_id");
} }
}) })
}, },
......
...@@ -160,7 +160,6 @@ export default { ...@@ -160,7 +160,6 @@ export default {
refund_id: that.refund_id refund_id: that.refund_id
}; };
getRefundDetail(params).then(res => { getRefundDetail(params).then(res => {
// console.log(res);
if (res.code < 0) { if (res.code < 0) {
// app.showToast({title: res.msg}); // app.showToast({title: res.msg});
this.$api.msg(res.msg); this.$api.msg(res.msg);
......
...@@ -215,7 +215,6 @@ ...@@ -215,7 +215,6 @@
//忘记支付密码而修改 //忘记支付密码而修改
forgetPass(e){ forgetPass(e){
console.log(e)
if(!this.issubm){ if(!this.issubm){
return false return false
...@@ -270,12 +269,9 @@ ...@@ -270,12 +269,9 @@
* 初始化数据 * 初始化数据
*/ */
async isStoreShopTel () { async isStoreShopTel () {
console.info(1111)
let res = await storeShopTel({}); let res = await storeShopTel({});
// console.log(res);
if(res.data.mobile){ if(res.data.mobile){
this.mobile = res.data.mobile; this.mobile = res.data.mobile;
console.log(this.mobile);
}else{ }else{
this.$api.msg('手机号获取失败请刷新页面'); this.$api.msg('手机号获取失败请刷新页面');
} }
......
...@@ -210,11 +210,9 @@ ...@@ -210,11 +210,9 @@
}, },
gdcancel(){ gdcancel(){
//取消 //取消
console.info('取消');
}, },
//关闭店铺 点击确认后 //关闭店铺 点击确认后
todeleteStore(){ todeleteStore(){
console.info("关闭店铺");
//请求关闭店铺 //请求关闭店铺
deleteStore({ deleteStore({
...@@ -243,7 +241,6 @@ ...@@ -243,7 +241,6 @@
}, },
//显示弹窗 清除缓存的 //显示弹窗 清除缓存的
toLogoutone(){ toLogoutone(){
// console.log(this.$store.state.Timer,'退出登入')
// this.$store.Timer // this.$store.Timer
this.$refs.moduPopupTwo.show(); this.$refs.moduPopupTwo.show();
}, },
...@@ -257,7 +254,7 @@ ...@@ -257,7 +254,7 @@
if(this.platform!='ios'){ if(this.platform!='ios'){
const pushLive = uni.requireNativePlugin('push-live'); const pushLive = uni.requireNativePlugin('push-live');
pushLive.closeService(function(res) { pushLive.closeService(function(res) {
console.log(res,'停止保活'); //'停止保活');
}); });
} }
...@@ -287,7 +284,6 @@ ...@@ -287,7 +284,6 @@
this.$api.msg(`已${statusTip}语音提示`); this.$api.msg(`已${statusTip}语音提示`);
this.$store.dispatch('AudioVoice',`已${statusTip}语音提示`).then((e) => { this.$store.dispatch('AudioVoice',`已${statusTip}语音提示`).then((e) => {
console.log(e);
//震动 调用//400ms//长震动 //震动 调用//400ms//长震动
uni.vibrateLong({ uni.vibrateLong({
success:(re)=> { success:(re)=> {
...@@ -301,7 +297,6 @@ ...@@ -301,7 +297,6 @@
}, },
//消息提醒 //消息提醒
switchChangesmg(e){ switchChangesmg(e){
// console.info(e,"eeee");
let val = e.detail.value; let val = e.detail.value;
if(val){ if(val){
this.isvoicemsg = true; this.isvoicemsg = true;
......
...@@ -97,7 +97,6 @@ ...@@ -97,7 +97,6 @@
let res = await typeManager({ let res = await typeManager({
}); });
console.info(res,"ress");
if(res.code==0){ if(res.code==0){
this.catefiryList = res.data; this.catefiryList = res.data;
}else{ }else{
...@@ -149,7 +148,6 @@ ...@@ -149,7 +148,6 @@
} }
}) })
} else if (res1.cancel) { } else if (res1.cancel) {
console.log('用户点击取消');
} }
} }
}); });
...@@ -157,7 +155,6 @@ ...@@ -157,7 +155,6 @@
}, },
//编辑分类方法 //编辑分类方法
editcate(data){ editcate(data){
console.info(data,"data");
this.cate_id = data.cate_id; this.cate_id = data.cate_id;
this.cate_name = data.cate_name; this.cate_name = data.cate_name;
this.orderby = data.orderby; this.orderby = data.orderby;
......
...@@ -186,7 +186,6 @@ ...@@ -186,7 +186,6 @@
}, },
onLoad(opdata) { onLoad(opdata) {
console.log(opdata)
this.goods_id = opdata.id; this.goods_id = opdata.id;
...@@ -197,15 +196,12 @@ ...@@ -197,15 +196,12 @@
return obj%1 === 0; return obj%1 === 0;
}, },
isInt(e){ isInt(e){
console.log(e)
if(!this.isInteger(e.detail.value)){ if(!this.isInteger(e.detail.value)){
this.$api.msg("库存或限购数量不能为小数!!"); this.$api.msg("库存或限购数量不能为小数!!");
} }
}, },
confirm(e){ confirm(e){
console.log(e)
this.type_id =e.item.id; this.type_id =e.item.id;
this.Typeindex = e.index; this.Typeindex = e.index;
this.ajaxGetSpecSelectfun();//获取选中的分类下面的规格 this.ajaxGetSpecSelectfun();//获取选中的分类下面的规格
...@@ -225,7 +221,6 @@ ...@@ -225,7 +221,6 @@
uploadimgfun(index){ uploadimgfun(index){
//上传图片方法 //上传图片方法
// uploadimgs(){ // uploadimgs(){
console.info("传图片~~~");
uni.chooseImage({ uni.chooseImage({
count:1, count:1,
...@@ -238,11 +233,9 @@ ...@@ -238,11 +233,9 @@
formData: this.uploaddata, formData: this.uploaddata,
success: (uploadFileRes) => { success: (uploadFileRes) => {
console.log(uploadFileRes.data,"上传成功后~");
let resdata = JSON.parse(uploadFileRes.data); let resdata = JSON.parse(uploadFileRes.data);
console.info(resdata,"resdata");
console.info(resdata.data,"resdata.data");
let endobjdatatwo = this.endobjdata; let endobjdatatwo = this.endobjdata;
endobjdatatwo[index].spec_img = resdata.data; endobjdatatwo[index].spec_img = resdata.data;
...@@ -261,10 +254,6 @@ ...@@ -261,10 +254,6 @@
addEditProductSpecfun(){ addEditProductSpecfun(){
// addEditProductSpec // addEditProductSpec
let isbool = false; let isbool = false;
console.info("endobjdata",this.endobjdata,this.endobjdata);
console.log(this.goods_id)
// return false; // return false;
//关闭秒杀的时候 秒杀价就是售价 //关闭秒杀的时候 秒杀价就是售价
...@@ -276,8 +265,7 @@ ...@@ -276,8 +265,7 @@
}) })
} }
// store_count:'', // store_count:'',
console.log(this.endobjdata)
isbool = this.endobjdata.every((item,index)=>{ isbool = this.endobjdata.every((item,index)=>{
return item.price!="" && item.store_count!="" && item.limit_num!="" && item.seckill_price !="" && item.pt_price!="" && item.min_price!=""; return item.price!="" && item.store_count!="" && item.limit_num!="" && item.seckill_price !="" && item.pt_price!="" && item.min_price!="";
}) })
...@@ -320,11 +308,8 @@ ...@@ -320,11 +308,8 @@
type_id:this.type_id,//模型id type_id:this.type_id,//模型id
item:this.endobjdata, item:this.endobjdata,
}).then((res)=>{ }).then((res)=>{
console.info(res,"ress"); if(res.code==0){
if(res.code==0){
console.log(res,"ress")
this.$api.msg(res.data); this.$api.msg(res.data);
setTimeout(()=>{ setTimeout(()=>{
uni.navigateBack({ uni.navigateBack({
...@@ -339,14 +324,10 @@ ...@@ -339,14 +324,10 @@
}) })
}, },
//商品规格详情 第一步 获取 一级 //商品规格详情 第一步 获取 一级
async goodsSpecfun(){ async goodsSpecfun(){
let res = await goodsSpec({ let res = await goodsSpec({
goods_id:this.goods_id goods_id:this.goods_id
}); });
console.log(res,"goodsSpec")
if(res.code==0){ if(res.code==0){
this.seckill_close = res.data.seckill_close;//秒杀的填写项的开关 this.seckill_close = res.data.seckill_close;//秒杀的填写项的开关
this.goodsSpec_goodsType = res.data.goodsType; this.goodsSpec_goodsType = res.data.goodsType;
...@@ -357,7 +338,6 @@ ...@@ -357,7 +338,6 @@
this.goodsSpec_goodsType.forEach((item,index)=>{ this.goodsSpec_goodsType.forEach((item,index)=>{
if(this.type_id == item.id){ if(this.type_id == item.id){
console.info(item.name);
this.Typeindex = index;//设置下拉分类默认选中值 this.Typeindex = index;//设置下拉分类默认选中值
} }
}) })
...@@ -369,9 +349,6 @@ ...@@ -369,9 +349,6 @@
item.price = item.s_price; item.price = item.s_price;
return item; return item;
}); });
console.info(endobjdata,"endobjdata");
this.endobjdata = endobjdata;//res.data.info;//之前的数据 默认值 this.endobjdata = endobjdata;//res.data.info;//之前的数据 默认值
...@@ -387,7 +364,6 @@ ...@@ -387,7 +364,6 @@
type_id:this.type_id, type_id:this.type_id,
}); });
console.log(res,"ajaxGetSpecSelectfun")
if(res.code==0){ if(res.code==0){
//items_ids 商品规格key,将规格id遍历 //items_ids 商品规格key,将规格id遍历
...@@ -423,13 +399,10 @@ ...@@ -423,13 +399,10 @@
}, },
//单选点击后 修改对应的选项的状态 //单选点击后 修改对应的选项的状态
changeSpecList(e){ changeSpecList(e){
console.info(e);
this.$set(this.specList, e.index, e.data);//设置赋值 用set 修改 this.$set(this.specList, e.index, e.data);//设置赋值 用set 修改
}, },
//封装的规格对选器选中 或者取消改变后的回调方法 //封装的规格对选器选中 或者取消改变后的回调方法
changecheckbox(data){ changecheckbox(data){
console.info(data,"rndata");
let goxuanlist = this.goxuanlist; let goxuanlist = this.goxuanlist;
goxuanlist[data.indexsz].child = data.child;//选中的数据 goxuanlist[data.indexsz].child = data.child;//选中的数据
goxuanlist[data.indexsz].specList_item_id = data.specList_item_id;//id goxuanlist[data.indexsz].specList_item_id = data.specList_item_id;//id
...@@ -488,13 +461,6 @@ ...@@ -488,13 +461,6 @@
} }
// console.info(sarr.join("\n"),"选中的名字组合");//名字列表
// console.info(sarrobj.join("\n"),"key");//4G 的id 3G的id
// console.info(sarrobjtwo.join("\n"),"keytwo");//网络的id
console.info(sarrobj,"sarrobj");
if(sarrobj[0].length!=0){ if(sarrobj[0].length!=0){
let endobjdata = sarrobj.map((item,index)=>{ let endobjdata = sarrobj.map((item,index)=>{
// sarr[index].replace(/,/g,'_') // sarr[index].replace(/,/g,'_')
...@@ -503,7 +469,6 @@ ...@@ -503,7 +469,6 @@
return objsdata; return objsdata;
}) })
// console.info(endobjdata,"endobjdata");
this.endobjdata = endobjdata; this.endobjdata = endobjdata;
}else{ }else{
...@@ -515,7 +480,7 @@ ...@@ -515,7 +480,7 @@
}, },
changeupdata(e){ changeupdata(e){
// console.info("数据改变后",e);
}, },
//初始化数据呀 //初始化数据呀
...@@ -527,7 +492,7 @@ ...@@ -527,7 +492,7 @@
for(let i1 = 0;i1<arr1.length;i1++){ for(let i1 = 0;i1<arr1.length;i1++){
for(let i2 = 0;i2<arr1.length;i2++){ for(let i2 = 0;i2<arr1.length;i2++){
for(let i3 = 0;i3<arr1.length;i3++){ for(let i3 = 0;i3<arr1.length;i3++){
// console.info(arr1[i1],arr1[i2],arr1[i3]);
} }
} }
} }
...@@ -544,7 +509,7 @@ ...@@ -544,7 +509,7 @@
watch:{ watch:{
form(e,c){ form(e,c){
console.info(e,c,"watch");
} }
}, },
......
...@@ -88,7 +88,6 @@ ...@@ -88,7 +88,6 @@
let editspecs = uni.getStorageSync("editspecs"); let editspecs = uni.getStorageSync("editspecs");
this.editspecsItem = editspecs; this.editspecsItem = editspecs;
console.info(editspecs,"editspecs");
if(editspecs.id){ if(editspecs.id){
this.spename = editspecs.name;//名称 this.spename = editspecs.name;//名称
this.spec_id = editspecs.id;//修改id this.spec_id = editspecs.id;//修改id
...@@ -137,7 +136,6 @@ ...@@ -137,7 +136,6 @@
this.time = e.detail.value this.time = e.detail.value
}, },
bindTimeChange(e) { bindTimeChange(e) {
console.info(e);
this.typeindex = e.detail.value this.typeindex = e.detail.value
}, },
//添加修改规格方法 //添加修改规格方法
...@@ -155,7 +153,6 @@ ...@@ -155,7 +153,6 @@
} }
let keynamesArr = this.keynamesArr.replace(/\s+/g,"");//去除空格 let keynamesArr = this.keynamesArr.replace(/\s+/g,"");//去除空格
console.log(keynamesArr,"this.keynamesArr");
// return false; // return false;
let parameter = { let parameter = {
...@@ -184,7 +181,6 @@ ...@@ -184,7 +181,6 @@
} }
}, },
switch2Change(e){ switch2Change(e){
console.info(e.detail.value);
this.checkedswitch = e.detail.value; this.checkedswitch = e.detail.value;
} }
}, },
...@@ -192,7 +188,6 @@ ...@@ -192,7 +188,6 @@
// split("\n") // split("\n")
keynames(e,c){ keynames(e,c){
//现在的 之前的 //现在的 之前的
// console.info(e,c);
this.keynamesArr = this.keynames.split("\n"); this.keynamesArr = this.keynames.split("\n");
this.keynamesArr = this.keynamesArr.join(";"); this.keynamesArr = this.keynamesArr.join(";");
} }
......
...@@ -88,7 +88,6 @@ ...@@ -88,7 +88,6 @@
let res = await shopCate({ let res = await shopCate({
}); });
console.info(res);
if(res.code==0){ if(res.code==0){
this.catefiryList = res.data; this.catefiryList = res.data;
}else{ }else{
...@@ -151,7 +150,6 @@ ...@@ -151,7 +150,6 @@
} }
}) })
} else if (res1.cancel) { } else if (res1.cancel) {
console.log('用户点击取消');
} }
} }
}); });
......
...@@ -93,7 +93,7 @@ ...@@ -93,7 +93,7 @@
uni.hideLoading(); uni.hideLoading();
}, },
fail:err=>{ fail:err=>{
console.log(err)
} }
}); });
//#endif //#endif
...@@ -155,14 +155,12 @@ ...@@ -155,14 +155,12 @@
success:(res)=>{ success:(res)=>{
uni.hideLoading(); uni.hideLoading();
this.imgUrl=res.tempFilePath; this.imgUrl=res.tempFilePath;
console.log(this.imgUrl)
uni.saveImageToPhotosAlbum({ //保存到相册 uni.saveImageToPhotosAlbum({ //保存到相册
filePath:res.tempFilePath, filePath:res.tempFilePath,
success:(res)=>{ success:(res)=>{
uni.showToast({title:'图片保存成功',icon:'none'}); uni.showToast({title:'图片保存成功',icon:'none'});
}, },
fail:function(err){ fail:function(err){
console.log(err)
this.$api.msg('图片保存失败'); this.$api.msg('图片保存失败');
} }
}) })
...@@ -254,7 +252,6 @@ ...@@ -254,7 +252,6 @@
const ctx = uni.createCanvasContext('myCanvas',this);//创建画布 const ctx = uni.createCanvasContext('myCanvas',this);//创建画布
ctx.setFillStyle('#FFFFFF'); ctx.setFillStyle('#FFFFFF');
ctx.fillRect(0,0,this.windowWidth,this.bgHeight); ctx.fillRect(0,0,this.windowWidth,this.bgHeight);
console.log(qrcodeurl,avaterSrc)
if(avaterSrc){//主图 if(avaterSrc){//主图
ctx.drawImage(avaterSrc,0,0,this.windowWidth,this.bgHeight); ctx.drawImage(avaterSrc,0,0,this.windowWidth,this.bgHeight);
......
...@@ -89,7 +89,6 @@ ...@@ -89,7 +89,6 @@
// https://zxluma.jxdsy.cn/attachs/ // https://zxluma.jxdsy.cn/attachs/
//console.info(res.data.file,"路径");
// uni.showLoading({ // uni.showLoading({
// title: '生成成功' // title: '生成成功'
...@@ -142,7 +141,6 @@ ...@@ -142,7 +141,6 @@
dxsss = 160 - cha*12; dxsss = 160 - cha*12;
} }
console.log("计算出来的dx",dxsss);
const d = await getSharePoster({ const d = await getSharePoster({
...@@ -229,18 +227,17 @@ ...@@ -229,18 +227,17 @@
}); });
console.log('海报生成成功, 临时路径: ' + d.poster.tempFilePath)
this.poster.finalPath = d.poster.tempFilePath; this.poster.finalPath = d.poster.tempFilePath;
console.log(this.poster.finalPath)
} }
this.qrShow = true; this.qrShow = true;
} catch (e) { } catch (e) {
_app.hideLoading(); _app.hideLoading();
_app.showToast(JSON.stringify(e)); _app.showToast(JSON.stringify(e));
console.log(JSON.stringify(e));
console.log('海报生成成功, 临时路径: ' + d.poster.tempFilePath)
} }
}, },
saveImage() { saveImage() {
......
...@@ -98,7 +98,6 @@ ...@@ -98,7 +98,6 @@
}, },
//银行卡选中后 //银行卡选中后
bindPickerChange(e){ bindPickerChange(e){
console.info(e.detail.value);
this.index = e.detail.value; this.index = e.detail.value;
} }
} }
......
...@@ -84,18 +84,15 @@ ...@@ -84,18 +84,15 @@
timeOutEvent = 0; timeOutEvent = 0;
timeOutEvent = setTimeout(()=>{ timeOutEvent = setTimeout(()=>{
//执行长按要执行的内容, //执行长按要执行的内容,
console.log("长按的事件处理");
uni.showModal({ uni.showModal({
title: '提示', title: '提示',
content: '确定解绑尾号为'+item.cardno.slice(-4)+'的银行卡吗?', content: '确定解绑尾号为'+item.cardno.slice(-4)+'的银行卡吗?',
success: (res)=> { success: (res)=> {
if (res.confirm) { if (res.confirm) {
//console.log('用户点击确定');
this.deleteBankfun(index,item); this.deleteBankfun(index,item);
} else if (res.cancel) { } else if (res.cancel) {
//console.log('用户点击取消');
} }
} }
}); });
......
...@@ -111,7 +111,6 @@ ...@@ -111,7 +111,6 @@
}, },
//监听滚动 //监听滚动
onPageScroll(e){ onPageScroll(e){
//console.log(e.scrollTop);
//处理返回顶部 //处理返回顶部
if(e.scrollTop>400){ if(e.scrollTop>400){
this.isshowtop = true; this.isshowtop = true;
...@@ -183,7 +182,6 @@ ...@@ -183,7 +182,6 @@
} }
let LineA = {"categories":categories,"series":[{"name":"收入","data":series2},{"name":"转出","data":series1}]}; let LineA = {"categories":categories,"series":[{"name":"收入","data":series2},{"name":"转出","data":series1}]};
console.info("LineA",LineA);
_self.textarea = JSON.stringify(LineA); _self.textarea = JSON.stringify(LineA);
_self.showLineA("canvasLineA",LineA); _self.showLineA("canvasLineA",LineA);
...@@ -199,7 +197,6 @@ ...@@ -199,7 +197,6 @@
}, },
//日期选择点击后 //日期选择点击后
onConfirm1(e){ onConfirm1(e){
console.info(e.result);
this.resulttime = e.result; this.resulttime = e.result;
this.list = []; this.list = [];
this.page = 0; this.page = 0;
......
...@@ -84,7 +84,6 @@ ...@@ -84,7 +84,6 @@
}, },
//滚动到最底部 //滚动到最底部
onReachBottom(){ onReachBottom(){
console.log("11");
if(this.isallshow){ if(this.isallshow){
this.storeCashListfun(); this.storeCashListfun();
} }
...@@ -103,7 +102,6 @@ ...@@ -103,7 +102,6 @@
mothtime:this.resulttime, mothtime:this.resulttime,
page:1,//this.page, page:1,//this.page,
}); });
console.info(res);
if(res.code==0){ if(res.code==0){
if(res.data.list){ if(res.data.list){
if(res.data.list.length!=0){ if(res.data.list.length!=0){
...@@ -125,7 +123,6 @@ ...@@ -125,7 +123,6 @@
}, },
//日期选择点击后 //日期选择点击后
onConfirm1(e){ onConfirm1(e){
console.info(e.result);
this.resulttime = e.result; this.resulttime = e.result;
this.list = []; this.list = [];
this.page = 0; this.page = 0;
......
...@@ -126,7 +126,6 @@ ...@@ -126,7 +126,6 @@
// uni.stopPullDownRefresh();//结束下拉刷新 // uni.stopPullDownRefresh();//结束下拉刷新
}, },
onShow() { onShow() {
console.info(uni.getStorageSync("token"),"token");
this.getstoreIndex(); this.getstoreIndex();
//检测更新 //检测更新
setTimeout(() => { setTimeout(() => {
......
...@@ -191,7 +191,6 @@ ...@@ -191,7 +191,6 @@
let strdate = near + "-"+mone;//年月 let strdate = near + "-"+mone;//年月
this.dqdate = date.toLocaleString(); this.dqdate = date.toLocaleString();
console.info(strdate,"strdate");
this.resulttime = strdate; this.resulttime = strdate;
this.storeMoneyget(); this.storeMoneyget();
...@@ -210,7 +209,6 @@ ...@@ -210,7 +209,6 @@
}, },
//日期选择点击后 重置表格 //日期选择点击后 重置表格
onConfirm1(e){ onConfirm1(e){
console.info(e.result);
this.resulttime = e.result; this.resulttime = e.result;
this.storeMoneyget();//重新获取统计图 this.storeMoneyget();//重新获取统计图
...@@ -233,7 +231,6 @@ ...@@ -233,7 +231,6 @@
}); });
uni.stopPullDownRefresh();//结束下拉刷新 uni.stopPullDownRefresh();//结束下拉刷新
if (res.code == 0) { if (res.code == 0) {
console.info(res.data);
let cartogram = res.data; let cartogram = res.data;
//let LineA = {"categories":["3-18","3-19","3-20","3-21","3-22","3-23","3-24"],"series":[{"name":"收入","data":[35,8,25,37,4,20,100]},{"name":"转出","data":[70,40,65,100,44,68,99]}]}; //let LineA = {"categories":["3-18","3-19","3-20","3-21","3-22","3-23","3-24"],"series":[{"name":"收入","data":[35,8,25,37,4,20,100]},{"name":"转出","data":[70,40,65,100,44,68,99]}]};
...@@ -245,14 +242,12 @@ ...@@ -245,14 +242,12 @@
; ;
for (let i in cartogram) { for (let i in cartogram) {
let item = cartogram; let item = cartogram;
// console.info(i,cartogram[i],"111");
categories.push(i); //可选日期列表 categories.push(i); //可选日期列表
series1.push(cartogram[i][0].orderCount); //订单条数 series1.push(cartogram[i][0].orderCount); //订单条数
// series2.push(cartogram[i].income);//收入 // series2.push(cartogram[i].income);//收入
// console.info("cartogram[i].length",cartogram[i].length);
if (cartogram[i].length == 2) { if (cartogram[i].length == 2) {
//有锁客数据时候 //有锁客数据时候
...@@ -283,7 +278,6 @@ ...@@ -283,7 +278,6 @@
] ]
}; };
console.info(LineA, "LineA");
_self.textarea = JSON.stringify(LineA); _self.textarea = JSON.stringify(LineA);
_self.showLineA("canvasLineA", LineA); _self.showLineA("canvasLineA", LineA);
......
...@@ -311,10 +311,8 @@ ...@@ -311,10 +311,8 @@
//取之前页面选的获取到的银行卡 //取之前页面选的获取到的银行卡
let selcarddata = uni.getStorageSync('selcard'); let selcarddata = uni.getStorageSync('selcard');
if(selcarddata){ if(selcarddata){
//console.log(selcarddata,"取之前页面选的获取到的银行卡");
this.selcarddata =selcarddata; this.selcarddata =selcarddata;
this.selcarddata.cardno = this.selcarddata.cardno.slice(-4); this.selcarddata.cardno = this.selcarddata.cardno.slice(-4);
//console.info(this.selcarddata.cardno.slice(-4));
//uni.removeStorageSync('selcard');//移除 //uni.removeStorageSync('selcard');//移除
setTimeout(()=>{ setTimeout(()=>{
uni.removeStorageSync('selcard');//移除 uni.removeStorageSync('selcard');//移除
...@@ -364,8 +362,6 @@ ...@@ -364,8 +362,6 @@
//验证身份提交方法 //验证身份提交方法
fromSubmitfun(e){ fromSubmitfun(e){
console.info(e);
this.$refs.VerifyIdentity.cancel();//关闭 this.$refs.VerifyIdentity.cancel();//关闭
let edata = e;//验证码数据 let edata = e;//验证码数据
delete edata.type; delete edata.type;
...@@ -396,10 +392,8 @@ ...@@ -396,10 +392,8 @@
this.gold = res.data.counts.gold; this.gold = res.data.counts.gold;
console.info(res);
this.mobile = res.data.mobile; this.mobile = res.data.mobile;
this.withdrawcount = res.data.withdrawcount; this.withdrawcount = res.data.withdrawcount;
console.info(this.withdrawcount)
} else { } else {
this.$api.msg(res.code); this.$api.msg(res.code);
...@@ -518,8 +512,6 @@ ...@@ -518,8 +512,6 @@
let res = await cashBank({ let res = await cashBank({
}); });
//console.log(res);
if(res.code==0){ if(res.code==0){
if(res.data.bank.cardno){ if(res.data.bank.cardno){
this.selcarddata = res.data.bank; this.selcarddata = res.data.bank;
...@@ -560,8 +552,6 @@ ...@@ -560,8 +552,6 @@
let reg = /(^[1-9](\d+)?(\.\d{1,2})?$)|(^[1-9]$)|(^\d\.[1-9]{1,2}$)|(^\d\.[0]{1}[1-9]{1}$|(^\d\.[1-9]{1}[0]{1}$)$)/; let reg = /(^[1-9](\d+)?(\.\d{1,2})?$)|(^[1-9]$)|(^\d\.[1-9]{1,2}$)|(^\d\.[0]{1}[1-9]{1}$|(^\d\.[1-9]{1}[0]{1}$)$)/;
let num = this.txsum; let num = this.txsum;
if (reg.exec(num)) { if (reg.exec(num)) {
//console.log('验证通过');
if(this.tabactive==1){ if(this.tabactive==1){
this.msg = "提现到微信"; this.msg = "提现到微信";
}else if(this.tabactive==2){ }else if(this.tabactive==2){
...@@ -573,7 +563,6 @@ ...@@ -573,7 +563,6 @@
this.togglePayment(); this.togglePayment();
} else { } else {
//console.log('验证失败');
this.$api.msg("您输入的金额有误~"); this.$api.msg("您输入的金额有误~");
} }
...@@ -586,11 +575,9 @@ ...@@ -586,11 +575,9 @@
}, },
//密码输入完成后的事件 //密码输入完成后的事件
checkPwd(e) { checkPwd(e) {
console.log("密码输入完成后的事件",e)
// 这里是写验证密码的业务逻辑,比如密码错误可以在这边清空 // 这里是写验证密码的业务逻辑,比如密码错误可以在这边清空
this.paymentPwd = e; this.paymentPwd = e;
this.togglePayment();//关闭 this.togglePayment();//关闭
console.info(parseFloat(this.txsum),'121212121')
if(parseFloat(this.txsum)>500||this.withdrawcount!=0){ if(parseFloat(this.txsum)>500||this.withdrawcount!=0){
this.visible= true this.visible= true
}else{ }else{
......
...@@ -77,7 +77,7 @@ const Im_store = { ...@@ -77,7 +77,7 @@ const Im_store = {
let IMUserID = uni.getStorageSync("IMUserID"); let IMUserID = uni.getStorageSync("IMUserID");
// #ifdef APP-PLUS // #ifdef APP-PLUS
store.dispatch("loginStatus", String(IMUserID)).then((res) => { //获取登录状态 store.dispatch("loginStatus", String(IMUserID)).then((res) => { //获取登录状态
console.info("登录状态",res); //"登录状态",res);
if (res.loginStatus != 1) { if (res.loginStatus != 1) {
//没登录 //没登录
store.dispatch("baselogin", String(IMUserID)) store.dispatch("baselogin", String(IMUserID))
...@@ -99,7 +99,7 @@ const Im_store = { ...@@ -99,7 +99,7 @@ const Im_store = {
}, result => { }, result => {
}) })
console.info("isSuccess",isSuccess); //"isSuccess",isSuccess);
//如果初始化成功 //如果初始化成功
if (isSuccess) { if (isSuccess) {
txIm.removeAdvancedMsgListener(); //移除高级消息监听 txIm.removeAdvancedMsgListener(); //移除高级消息监听
...@@ -112,12 +112,12 @@ const Im_store = { ...@@ -112,12 +112,12 @@ const Im_store = {
// #ifdef APP-PLUS // #ifdef APP-PLUS
txIm = uni.requireNativePlugin('TX-TencentIM'); txIm = uni.requireNativePlugin('TX-TencentIM');
// #endif // #endif
console.info("新消息来了"); //"新消息来了");
//新消息来了 //新消息来了
//震动 //震动
// uni.vibrateLong({ // uni.vibrateLong({
// success: function () { // success: function () {
// console.log('success'); // //('success');
// } // }
// }); // });
...@@ -158,7 +158,7 @@ const Im_store = { ...@@ -158,7 +158,7 @@ const Im_store = {
"msgId": msg.msgId "msgId": msg.msgId
}, progressResult => { }, progressResult => {
}, succResult => { }, succResult => {
// console.info("succResult",succResult) // //"succResult",succResult)
}, result => { }, result => {
}) })
...@@ -200,15 +200,15 @@ const Im_store = { ...@@ -200,15 +200,15 @@ const Im_store = {
//设置群消息监听 //设置群消息监听
txIm.setGroupListener(result => { txIm.setGroupListener(result => {
//群消息监听 //群消息监听
console.log(result,"群消息监听"); //(result,"群消息监听");
}); });
//设置好友消息监听 //设置好友消息监听
txIm.setFriendListener(result => { txIm.setFriendListener(result => {
console.log(result,"设置好友消息监听"); //(result,"设置好友消息监听");
}); });
//添加信号侦听器? //添加信号侦听器?
txIm.addSignalingListener(result => { txIm.addSignalingListener(result => {
console.log(result,"添加好友信息监听"); //(result,"添加好友信息监听");
if (result.type === "onReceiveNewInvitation") { //收到新的邀请 if (result.type === "onReceiveNewInvitation") { //收到新的邀请
_self.inviteData = result; _self.inviteData = result;
} }
...@@ -221,7 +221,7 @@ const Im_store = { ...@@ -221,7 +221,7 @@ const Im_store = {
expireTime: 31536000,//604800, //登录过期时间,可以不填写 365天 expireTime: 31536000,//604800, //登录过期时间,可以不填写 365天
filePath: plus.io.convertLocalFileSystemURL('_doc'), //文件路径? filePath: plus.io.convertLocalFileSystemURL('_doc'), //文件路径?
}, result => { }, result => {
console.log(result, "登录完成"); //(result, "登录完成");
//_self.currentUser = _self.user1; //修改当前登录的用户id IMid //_self.currentUser = _self.user1; //修改当前登录的用户id IMid
//上传安卓平台证书 //上传安卓平台证书
let txIm1 = {}; let txIm1 = {};
...@@ -304,7 +304,7 @@ const Im_store = { ...@@ -304,7 +304,7 @@ const Im_store = {
txIm = uni.requireNativePlugin('TX-TencentIM'); txIm = uni.requireNativePlugin('TX-TencentIM');
// #endif // #endif
let msgs = result.msgs; let msgs = result.msgs;
// console.log(result, "d0历史消息"); // //(result, "d0历史消息");
msgs.reverse(); //数组逆序一下 msgs.reverse(); //数组逆序一下
msgs = msgs.map((msg, index) => { msgs = msgs.map((msg, index) => {
if (msg.elemType == 3) { if (msg.elemType == 3) {
...@@ -320,7 +320,7 @@ const Im_store = { ...@@ -320,7 +320,7 @@ const Im_store = {
},succResult=>{ },succResult=>{
//下载成功 //下载成功
if (succResult.path) { if (succResult.path) {
// console.info("语音消息下载成功",succResult); // //"语音消息下载成功",succResult);
msg.mp3file = succResult; msg.mp3file = succResult;
} }
},failResult=>{ },failResult=>{
...@@ -330,9 +330,9 @@ const Im_store = { ...@@ -330,9 +330,9 @@ const Im_store = {
//获取sound资源url //获取sound资源url
txIm.getSoundUrl({"msgId":msg.msgId},result=>{ txIm.getSoundUrl({"msgId":msg.msgId},result=>{
// console.log("----------------------------------------"); // //("----------------------------------------");
// console.log(result,"获取语音资源成功"); // //(result,"获取语音资源成功");
// console.log("----------------------------------------"); // //("----------------------------------------");
if(result.code==0){ if(result.code==0){
msg.SoundUrl = result; msg.SoundUrl = result;
} }
...@@ -363,7 +363,7 @@ const Im_store = { ...@@ -363,7 +363,7 @@ const Im_store = {
}) })
}else if(msg.elemType == 2){ }else if(msg.elemType == 2){
//自定义消息 //自定义消息
// console.info(msg,"msgitem1"); // //msg,"msgitem1");
if(msg.customElem.extension){ if(msg.customElem.extension){
if(msg.customElem.extension.indexOf("type")!=-1){ if(msg.customElem.extension.indexOf("type")!=-1){
msg.customdata = JSON.parse(msg.customElem.desc); msg.customdata = JSON.parse(msg.customElem.desc);
...@@ -376,7 +376,7 @@ const Im_store = { ...@@ -376,7 +376,7 @@ const Im_store = {
if (result.msgs.length > 0) { if (result.msgs.length > 0) {
//this.historyC2CMsgId = result.msgs[result.msgs.length - 1].msgId //this.historyC2CMsgId = result.msgs[result.msgs.length - 1].msgId
} }
// console.log(msgs, "历史消息"); // //(msgs, "历史消息");
store.commit("Setmsgslist", msgs) store.commit("Setmsgslist", msgs)
reslove(result); reslove(result);
}) })
...@@ -391,7 +391,7 @@ const Im_store = { ...@@ -391,7 +391,7 @@ const Im_store = {
// "msgId":objects.msgId // "msgId":objects.msgId
txIm.getGroupHistoryMessageList({"groupId":store.state.groupId,"count":999999,"msgId":""},result=>{ txIm.getGroupHistoryMessageList({"groupId":store.state.groupId,"count":999999,"msgId":""},result=>{
let msgs = result.msgs; let msgs = result.msgs;
// console.log(result, "q历史消息"); // //(result, "q历史消息");
msgs.reverse(); //数组逆序一下 msgs.reverse(); //数组逆序一下
msgs = msgs.map((msg,index)=>{ msgs = msgs.map((msg,index)=>{
...@@ -408,7 +408,7 @@ const Im_store = { ...@@ -408,7 +408,7 @@ const Im_store = {
},succResult=>{ },succResult=>{
if (succResult.path) { if (succResult.path) {
// console.info("语音消息下载成功",succResult); // //"语音消息下载成功",succResult);
msg.mp3file = succResult; msg.mp3file = succResult;
} }
},failResult=>{ },failResult=>{
...@@ -418,9 +418,9 @@ const Im_store = { ...@@ -418,9 +418,9 @@ const Im_store = {
//获取sound资源url //获取sound资源url
txIm.getSoundUrl({"msgId":msg.msgId},result=>{ txIm.getSoundUrl({"msgId":msg.msgId},result=>{
// console.log("----------------------------------------"); // //("----------------------------------------");
// console.log(result,"获取语音资源成功"); // //(result,"获取语音资源成功");
// console.log("----------------------------------------"); // //("----------------------------------------");
if(result.code==0){ if(result.code==0){
msg.SoundUrl = result; msg.SoundUrl = result;
} }
...@@ -450,7 +450,7 @@ const Im_store = { ...@@ -450,7 +450,7 @@ const Im_store = {
}) })
}else if(msg.elemType == 2){ }else if(msg.elemType == 2){
//自定义消息 //自定义消息
console.info(msg,"msgitem"); //msg,"msgitem");
if(msg.customElem.extension){ if(msg.customElem.extension){
if(msg.customElem.extension.indexOf("type")!=-1){ if(msg.customElem.extension.indexOf("type")!=-1){
msg.customdata = JSON.parse(msg.customElem.desc); msg.customdata = JSON.parse(msg.customElem.desc);
...@@ -459,7 +459,7 @@ const Im_store = { ...@@ -459,7 +459,7 @@ const Im_store = {
} }
return msg; return msg;
}); });
// console.info("群历史消息",msgs); // //"群历史消息",msgs);
store.commit("setqunmsgslist", msgs) store.commit("setqunmsgslist", msgs)
reslove(msgs); reslove(msgs);
...@@ -503,8 +503,8 @@ const Im_store = { ...@@ -503,8 +503,8 @@ const Im_store = {
conversationList.forEach((item, index) => { conversationList.forEach((item, index) => {
Unread += item.unreadCount; Unread += item.unreadCount;
}) })
console.info("未读总", Unread); //"未读总", Unread);
// console.info("conversationList",conversationList); // //"conversationList",conversationList);
store.commit("setmyconversationList", conversationList); //更新会话列表 store.commit("setmyconversationList", conversationList); //更新会话列表
store.commit('setUnread',Unread);//未读的数量 store.commit('setUnread',Unread);//未读的数量
...@@ -561,11 +561,11 @@ const Im_store = { ...@@ -561,11 +561,11 @@ const Im_store = {
}, },
//新消息提示 //新消息提示
messageTisfun(){ messageTisfun(){
console.info("语音消息提醒"); //"语音消息提醒");
let isvoicemsg = uni.getStorageSync("isvoicemsg"); let isvoicemsg = uni.getStorageSync("isvoicemsg");
if(isvoicemsg=='-1'){ if(isvoicemsg=='-1'){
console.info("设置关闭了消息 不提示 !"); //"设置关闭了消息 不提示 !");
return false; return false;
} }
this.platform = uni.getSystemInfoSync().platform; this.platform = uni.getSystemInfoSync().platform;
...@@ -588,7 +588,7 @@ const Im_store = { ...@@ -588,7 +588,7 @@ const Im_store = {
uni.vibrateLong();//震动 调用//400ms//长震动 uni.vibrateLong();//震动 调用//400ms//长震动
}); });
innerAudioContext.onError((res) => { //音频播放错误 innerAudioContext.onError((res) => { //音频播放错误
console.log(res,'播放失败')
}); });
} }
} }
......
...@@ -161,13 +161,11 @@ const store = new Vuex.Store({ ...@@ -161,13 +161,11 @@ const store = new Vuex.Store({
commit('login') commit('login')
setTimeout(function () { //模拟异步请求服务器获取 openid setTimeout(function () { //模拟异步请求服务器获取 openid
const openid = '123456789' const openid = '123456789'
console.log('uni.request mock openid[' + openid + ']');
commit('setOpenid', openid) commit('setOpenid', openid)
resolve(openid) resolve(openid)
}, 1000) }, 1000)
}, },
fail: (err) => { fail: (err) => {
console.log('uni.login 接口调用失败,将无法正常使用开放接口等服务', err)
reject(err) reject(err)
} }
}) })
...@@ -199,7 +197,7 @@ const store = new Vuex.Store({ ...@@ -199,7 +197,7 @@ const store = new Vuex.Store({
returnAudio: true returnAudio: true
}).then(audio=>{ }).then(audio=>{
audio.onPlay(()=>{ audio.onPlay(()=>{
console.log('音频开始播放了') //('音频开始播放了')
}) })
audio.play(); audio.play();
resolve();//结束 resolve();//结束
...@@ -208,16 +206,12 @@ const store = new Vuex.Store({ ...@@ -208,16 +206,12 @@ const store = new Vuex.Store({
}, },
//导入IM 账号信息 //导入IM 账号信息
importShopAccountfun(context,text){ importShopAccountfun(context,text){
console.log(uni.getStorageSync('token'));
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
importShopAccount({}).then((res)=>{ importShopAccount({}).then((res)=>{
console.info(res,"导入账号");
if(res.code==0){ if(res.code==0){
if(res.data.code==0){ if(res.data.code==0){
let IMUserID = res.data.data.data.Identifier?res.data.data.data.Identifier:res.data.data.data.UserID; let IMUserID = res.data.data.data.Identifier?res.data.data.data.Identifier:res.data.data.data.UserID;
console.info(IMUserID,"IMUserID");
IMUserID = IMUserID?IMUserID:res.data.data.data.IMUserID;//每次返回的格式有可能不一样 IMUserID = IMUserID?IMUserID:res.data.data.data.IMUserID;//每次返回的格式有可能不一样
console.info(IMUserID,"IMUserID");
uni.setStorageSync("IMUserID",IMUserID); uni.setStorageSync("IMUserID",IMUserID);
context.dispatch("baselogin", IMUserID); //登录 context.dispatch("baselogin", IMUserID); //登录
} }
......
...@@ -4,14 +4,11 @@ const ShreUserPosterBackgroundKey = 'ShrePosterBackground_'; // 背景图片缓 ...@@ -4,14 +4,11 @@ const ShreUserPosterBackgroundKey = 'ShrePosterBackground_'; // 背景图片缓
// let isshowmodel = true; // let isshowmodel = true;
export default function getSharePoster(obj) { export default function getSharePoster(obj) {
console.log("isshowmodel12",obj.isshowmodel);
if(obj.isshowmodel==="" || obj.isshowmodel==undefined){ if(obj.isshowmodel==="" || obj.isshowmodel==undefined){
obj.isshowmodel = true;//默认显示 obj.isshowmodel = true;//默认显示
}else{ }else{
} }
console.log("isshowmodel1",obj.isshowmodel);
// console.log("isshowmodel",isshowmodel);
return new Promise(async (resolve, reject) => { return new Promise(async (resolve, reject) => {
try { try {
...@@ -688,7 +685,6 @@ export function drawQrCode(Context, qrCodeObj,isshowmodel) { //生成二维码 ...@@ -688,7 +685,6 @@ export function drawQrCode(Context, qrCodeObj,isshowmodel) { //生成二维码
}); });
Context.setFillStyle(qrCodeAlg.modules[row][col] ? foreground : options.background); Context.setFillStyle(qrCodeAlg.modules[row][col] ? foreground : options.background);
// console.log("重要的内容哦哈哈哈",foreground ,options.background, row,
// col, // col,
// count, // count,
// options); // options);
......
...@@ -18,7 +18,7 @@ let _app = { ...@@ -18,7 +18,7 @@ let _app = {
break; break;
default: default:
//image = '/static/1.jpg'; //image = '/static/1.jpg';
image = 'https://s2.ax1x.com/2019/12/10/QBS0wF.jpg'; image = ' ';
break; break;
} }
if (image) if (image)
......
...@@ -13,7 +13,7 @@ const getAudioUrl = 'https://tsn.baidu.com/text2audio'; ...@@ -13,7 +13,7 @@ const getAudioUrl = 'https://tsn.baidu.com/text2audio';
function getBDVoicToken() { function getBDVoicToken() {
return new Promise((rs, rj) => { return new Promise((rs, rj) => {
console.log('准备访问接口获取语音token'); //准备访问接口获取语音token
//这里用的是自己的账户 150的 后面加入我不在了 自己去注册一个 https://ai.baidu.com/ //这里用的是自己的账户 150的 后面加入我不在了 自己去注册一个 https://ai.baidu.com/
// let APIKey = "LYDenqXnlBbFdvuxumqspqMz"; // let APIKey = "LYDenqXnlBbFdvuxumqspqMz";
...@@ -31,7 +31,7 @@ function getBDVoicToken() { ...@@ -31,7 +31,7 @@ function getBDVoicToken() {
getVoiceToken({ getVoiceToken({
}).then((res)=>{ }).then((res)=>{
console.log(res,"res"); //res,"res"
rs(res); rs(res);
}).catch((res)=>{ }).catch((res)=>{
rs(res); rs(res);
...@@ -47,11 +47,9 @@ function getBDVoicToken() { ...@@ -47,11 +47,9 @@ function getBDVoicToken() {
"content-type": "application/x-www-form-urlencoded" "content-type": "application/x-www-form-urlencoded"
}, },
success: (res) => { success: (res) => {
console.log('访问成功');
rs(res); rs(res);
}, },
fail: (err) => { fail: (err) => {
console.log('访问失败');
rj(err); rj(err);
} }
}) })
...@@ -89,34 +87,34 @@ export default function openVoice(objs) { // 传入需转为语音的文本内 ...@@ -89,34 +87,34 @@ export default function openVoice(objs) { // 传入需转为语音的文本内
} }
function openVoiceFc(objs, returnAudio) { function openVoiceFc(objs, returnAudio) {
console.log('准备获取语音tok'); // 准备获取语音tok
if(returnAudio) { if(returnAudio) {
return new Promise((resolve, reject)=>{ return new Promise((resolve, reject)=>{
getBDVoicToken().then(res => { getBDVoicToken().then(res => {
console.log('获取语音tok接口成功'); //'获取语音tok接口成功');
if (res.data && res.data.access_token) { if (res.data && res.data.access_token) {
console.log('token: ' + res.data.access_token); //'token: ' + res.data.access_token);
resolve(tts(objs, res.data.access_token, returnAudio)); resolve(tts(objs, res.data.access_token, returnAudio));
} else { } else {
console.log('获取语音tok接口为空'); //'获取语音tok接口为空');
reject('获取语音tok接口为空'); reject('获取语音tok接口为空');
} }
}).catch(err => { }).catch(err => {
console.log('获取语音tok接口失败'); //'获取语音tok接口失败');
reject(err||'获取语音tok接口失败'); reject(err||'获取语音tok接口失败');
}) })
}) })
}else{ }else{
getBDVoicToken().then(res => { getBDVoicToken().then(res => {
console.log('获取语音tok接口成功'); //'获取语音tok接口成功');
if (res.data && res.data.access_token) { if (res.data && res.data.access_token) {
console.log('token: ' + res.data.access_token); //'token: ' + res.data.access_token);
tts(objs, res.data.access_token); tts(objs, res.data.access_token);
} else { } else {
console.log('获取语音tok接口为空'); //'获取语音tok接口为空');
} }
}).catch(err => { }).catch(err => {
console.log('获取语音tok接口失败'); //'获取语音tok接口失败');
}) })
} }
} }
...@@ -158,22 +156,22 @@ function btts(param, options, audioCallback, lineUp, returnAudio) { ...@@ -158,22 +156,22 @@ function btts(param, options, audioCallback, lineUp, returnAudio) {
if(returnAudio) { if(returnAudio) {
audio.onEnded(() => { audio.onEnded(() => {
console.log('音频播放结束'); //'音频播放结束');
console.log('销毁音频实例'); //'销毁音频实例');
audio.destroy(); //销毁音频实例 audio.destroy(); //销毁音频实例
audio = null; audio = null;
}) })
audio.onError((e)=>{ audio.onError((e)=>{
if (audioCallback && audioCallback.onError && typeof(audioCallback.onError) == 'function') audioCallback.onError(e); if (audioCallback && audioCallback.onError && typeof(audioCallback.onError) == 'function') audioCallback.onError(e);
console.log('音频播放错误: ' + JSON.stringify(e)); //'音频播放错误: ' + JSON.stringify(e));
console.log('销毁音频实例'); //'销毁音频实例');
audio.destroy(); //销毁音频实例 audio.destroy(); //销毁音频实例
audio = null; audio = null;
}) })
return audio; return audio;
} }
audio.onPlay(() => { audio.onPlay(() => {
console.log('音频播放开始'); //'音频播放开始');
if (audioCallback && audioCallback.onPlay && typeof(audioCallback.onPlay) == 'function') audioCallback.onPlay(); if (audioCallback && audioCallback.onPlay && typeof(audioCallback.onPlay) == 'function') audioCallback.onPlay();
}) })
audio.onPause(()=>{ audio.onPause(()=>{
...@@ -195,26 +193,26 @@ function btts(param, options, audioCallback, lineUp, returnAudio) { ...@@ -195,26 +193,26 @@ function btts(param, options, audioCallback, lineUp, returnAudio) {
if (audioCallback && audioCallback.onSeeked && typeof(audioCallback.onSeeked) == 'function') audioCallback.onSeeked(); if (audioCallback && audioCallback.onSeeked && typeof(audioCallback.onSeeked) == 'function') audioCallback.onSeeked();
}) })
audio.onEnded(() => { audio.onEnded(() => {
console.log('音频播放结束'); //'音频播放结束');
console.log('销毁音频实例'); //'销毁音频实例');
audio.destroy(); //销毁音频实例 audio.destroy(); //销毁音频实例
audio = null; audio = null;
if (audioCallback && audioCallback.onEnded && typeof(audioCallback.onEnded) == 'function') audioCallback.onEnded(); if (audioCallback && audioCallback.onEnded && typeof(audioCallback.onEnded) == 'function') audioCallback.onEnded();
if (lineUp !== false) { if (lineUp !== false) {
if (audioTeam.length > 0) { if (audioTeam.length > 0) {
console.log('队列中'); //'队列中');
openVoiceFc(audioTeam[0]); openVoiceFc(audioTeam[0]);
audioTeam.splice(0, 1); audioTeam.splice(0, 1);
} else { } else {
console.log('队列为零'); //'队列为零');
audioStartSwitch = false; audioStartSwitch = false;
} }
} }
}) })
audio.onError((e)=>{ audio.onError((e)=>{
if (audioCallback && audioCallback.onError && typeof(audioCallback.onError) == 'function') audioCallback.onError(e); if (audioCallback && audioCallback.onError && typeof(audioCallback.onError) == 'function') audioCallback.onError(e);
console.log('音频播放错误: ' + JSON.stringify(e)); //'音频播放错误: ' + JSON.stringify(e));
console.log('销毁音频实例'); //'销毁音频实例');
audio.destroy(); //销毁音频实例 audio.destroy(); //销毁音频实例
audio = null; audio = null;
}) })
......
...@@ -16,23 +16,23 @@ function judgeIosPermissionPush() { ...@@ -16,23 +16,23 @@ function judgeIosPermissionPush() {
if (app.currentUserNotificationSettings) { if (app.currentUserNotificationSettings) {
var settings = app.currentUserNotificationSettings(); var settings = app.currentUserNotificationSettings();
enabledTypes = settings.plusGetAttribute("types"); enabledTypes = settings.plusGetAttribute("types");
console.log("enabledTypes1:" + enabledTypes); //"enabledTypes1:" + enabledTypes);
if (enabledTypes == 0) { if (enabledTypes == 0) {
console.log("推送权限没有开启"); //"推送权限没有开启");
} else { } else {
result = true; result = true;
console.log("已经开启推送功能!") //"已经开启推送功能!")
} }
plus.ios.deleteObject(settings); plus.ios.deleteObject(settings);
} else { } else {
enabledTypes = app.enabledRemoteNotificationTypes(); enabledTypes = app.enabledRemoteNotificationTypes();
if (enabledTypes == 0) { if (enabledTypes == 0) {
console.log("推送权限没有开启!"); //"推送权限没有开启!");
} else { } else {
result = true; result = true;
console.log("已经开启推送功能!") //"已经开启推送功能!")
} }
console.log("enabledTypes2:" + enabledTypes); //"enabledTypes2:" + enabledTypes);
} }
plus.ios.deleteObject(app); plus.ios.deleteObject(app);
plus.ios.deleteObject(UIApplication); plus.ios.deleteObject(UIApplication);
...@@ -45,17 +45,17 @@ function judgeIosPermissionLocation() { ...@@ -45,17 +45,17 @@ function judgeIosPermissionLocation() {
var cllocationManger = plus.ios.import("CLLocationManager"); var cllocationManger = plus.ios.import("CLLocationManager");
var status = cllocationManger.authorizationStatus(); var status = cllocationManger.authorizationStatus();
result = (status != 2) result = (status != 2)
console.log("定位权限开启:" + result); //"定位权限开启:" + result);
// 以下代码判断了手机设备的定位是否关闭,推荐另行使用方法 checkSystemEnableLocation // 以下代码判断了手机设备的定位是否关闭,推荐另行使用方法 checkSystemEnableLocation
/* var enable = cllocationManger.locationServicesEnabled(); /* var enable = cllocationManger.locationServicesEnabled();
var status = cllocationManger.authorizationStatus(); var status = cllocationManger.authorizationStatus();
console.log("enable:" + enable); //"enable:" + enable);
console.log("status:" + status); //"status:" + status);
if (enable && status != 2) { if (enable && status != 2) {
result = true; result = true;
console.log("手机定位服务已开启且已授予定位权限"); //"手机定位服务已开启且已授予定位权限");
} else { } else {
console.log("手机系统的定位没有打开或未给予定位权限"); //"手机系统的定位没有打开或未给予定位权限");
} */ } */
plus.ios.deleteObject(cllocationManger); plus.ios.deleteObject(cllocationManger);
return result; return result;
...@@ -67,12 +67,12 @@ function judgeIosPermissionRecord() { ...@@ -67,12 +67,12 @@ function judgeIosPermissionRecord() {
var avaudiosession = plus.ios.import("AVAudioSession"); var avaudiosession = plus.ios.import("AVAudioSession");
var avaudio = avaudiosession.sharedInstance(); var avaudio = avaudiosession.sharedInstance();
var permissionStatus = avaudio.recordPermission(); var permissionStatus = avaudio.recordPermission();
console.log("permissionStatus:" + permissionStatus); //"permissionStatus:" + permissionStatus);
if (permissionStatus == 1684369017 || permissionStatus == 1970168948) { if (permissionStatus == 1684369017 || permissionStatus == 1970168948) {
console.log("麦克风权限没有开启"); //"麦克风权限没有开启");
} else { } else {
result = true; result = true;
console.log("麦克风权限已经开启"); //"麦克风权限已经开启");
} }
plus.ios.deleteObject(avaudiosession); plus.ios.deleteObject(avaudiosession);
return result; return result;
...@@ -83,12 +83,12 @@ function judgeIosPermissionCamera() { ...@@ -83,12 +83,12 @@ function judgeIosPermissionCamera() {
var result = false; var result = false;
var AVCaptureDevice = plus.ios.import("AVCaptureDevice"); var AVCaptureDevice = plus.ios.import("AVCaptureDevice");
var authStatus = AVCaptureDevice.authorizationStatusForMediaType('vide'); var authStatus = AVCaptureDevice.authorizationStatusForMediaType('vide');
console.log("authStatus:" + authStatus); //"authStatus:" + authStatus);
if (authStatus == 3) { if (authStatus == 3) {
result = true; result = true;
console.log("相机权限已经开启"); //"相机权限已经开启");
} else { } else {
console.log("相机权限没有开启"); //"相机权限没有开启");
} }
plus.ios.deleteObject(AVCaptureDevice); plus.ios.deleteObject(AVCaptureDevice);
return result; return result;
...@@ -99,12 +99,12 @@ function judgeIosPermissionPhotoLibrary() { ...@@ -99,12 +99,12 @@ function judgeIosPermissionPhotoLibrary() {
var result = false; var result = false;
var PHPhotoLibrary = plus.ios.import("PHPhotoLibrary"); var PHPhotoLibrary = plus.ios.import("PHPhotoLibrary");
var authStatus = PHPhotoLibrary.authorizationStatus(); var authStatus = PHPhotoLibrary.authorizationStatus();
console.log("authStatus:" + authStatus); //"authStatus:" + authStatus);
if (authStatus == 3) { if (authStatus == 3) {
result = true; result = true;
console.log("相册权限已经开启"); //"相册权限已经开启");
} else { } else {
console.log("相册权限没有开启"); //"相册权限没有开启");
} }
plus.ios.deleteObject(PHPhotoLibrary); plus.ios.deleteObject(PHPhotoLibrary);
return result; return result;
...@@ -117,9 +117,9 @@ function judgeIosPermissionContact() { ...@@ -117,9 +117,9 @@ function judgeIosPermissionContact() {
var cnAuthStatus = CNContactStore.authorizationStatusForEntityType(0); var cnAuthStatus = CNContactStore.authorizationStatusForEntityType(0);
if (cnAuthStatus == 3) { if (cnAuthStatus == 3) {
result = true; result = true;
console.log("通讯录权限已经开启"); //"通讯录权限已经开启");
} else { } else {
console.log("通讯录权限没有开启"); //"通讯录权限没有开启");
} }
plus.ios.deleteObject(CNContactStore); plus.ios.deleteObject(CNContactStore);
return result; return result;
...@@ -132,9 +132,9 @@ function judgeIosPermissionCalendar() { ...@@ -132,9 +132,9 @@ function judgeIosPermissionCalendar() {
var ekAuthStatus = EKEventStore.authorizationStatusForEntityType(0); var ekAuthStatus = EKEventStore.authorizationStatusForEntityType(0);
if (ekAuthStatus == 3) { if (ekAuthStatus == 3) {
result = true; result = true;
console.log("日历权限已经开启"); //"日历权限已经开启");
} else { } else {
console.log("日历权限没有开启"); //"日历权限没有开启");
} }
plus.ios.deleteObject(EKEventStore); plus.ios.deleteObject(EKEventStore);
return result; return result;
...@@ -147,9 +147,9 @@ function judgeIosPermissionMemo() { ...@@ -147,9 +147,9 @@ function judgeIosPermissionMemo() {
var ekAuthStatus = EKEventStore.authorizationStatusForEntityType(1); var ekAuthStatus = EKEventStore.authorizationStatusForEntityType(1);
if (ekAuthStatus == 3) { if (ekAuthStatus == 3) {
result = true; result = true;
console.log("备忘录权限已经开启"); //"备忘录权限已经开启");
} else { } else {
console.log("备忘录权限没有开启"); //"备忘录权限没有开启");
} }
plus.ios.deleteObject(EKEventStore); plus.ios.deleteObject(EKEventStore);
return result; return result;
...@@ -164,17 +164,17 @@ function requestAndroidPermission(permissionID) { ...@@ -164,17 +164,17 @@ function requestAndroidPermission(permissionID) {
var result = 0; var result = 0;
for (var i = 0; i < resultObj.granted.length; i++) { for (var i = 0; i < resultObj.granted.length; i++) {
var grantedPermission = resultObj.granted[i]; var grantedPermission = resultObj.granted[i];
console.log('已获取的权限:' + grantedPermission); //'已获取的权限:' + grantedPermission);
result = 1 result = 1
} }
for (var i = 0; i < resultObj.deniedPresent.length; i++) { for (var i = 0; i < resultObj.deniedPresent.length; i++) {
var deniedPresentPermission = resultObj.deniedPresent[i]; var deniedPresentPermission = resultObj.deniedPresent[i];
console.log('拒绝本次申请的权限:' + deniedPresentPermission); //'拒绝本次申请的权限:' + deniedPresentPermission);
result = 0 result = 0
} }
for (var i = 0; i < resultObj.deniedAlways.length; i++) { for (var i = 0; i < resultObj.deniedAlways.length; i++) {
var deniedAlwaysPermission = resultObj.deniedAlways[i]; var deniedAlwaysPermission = resultObj.deniedAlways[i];
console.log('永久拒绝申请的权限:' + deniedAlwaysPermission); //'永久拒绝申请的权限:' + deniedAlwaysPermission);
result = -1 result = -1
} }
resolve(result); resolve(result);
...@@ -184,7 +184,7 @@ function requestAndroidPermission(permissionID) { ...@@ -184,7 +184,7 @@ function requestAndroidPermission(permissionID) {
// } // }
}, },
function(error) { function(error) {
console.log('申请权限错误:' + error.code + " = " + error.message); //'申请权限错误:' + error.code + " = " + error.message);
resolve({ resolve({
code: error.code, code: error.code,
message: error.message message: error.message
...@@ -230,7 +230,7 @@ function gotoAppPermissionSetting() { ...@@ -230,7 +230,7 @@ function gotoAppPermissionSetting() {
plus.ios.deleteObject(NSURL2); plus.ios.deleteObject(NSURL2);
plus.ios.deleteObject(application2); plus.ios.deleteObject(application2);
} else { } else {
// console.log(plus.device.vendor); // //plus.device.vendor);
var Intent = plus.android.importClass("android.content.Intent"); var Intent = plus.android.importClass("android.content.Intent");
var Settings = plus.android.importClass("android.provider.Settings"); var Settings = plus.android.importClass("android.provider.Settings");
var Uri = plus.android.importClass("android.net.Uri"); var Uri = plus.android.importClass("android.net.Uri");
...@@ -250,7 +250,7 @@ function checkSystemEnableLocation() { ...@@ -250,7 +250,7 @@ function checkSystemEnableLocation() {
var result = false; var result = false;
var cllocationManger = plus.ios.import("CLLocationManager"); var cllocationManger = plus.ios.import("CLLocationManager");
var result = cllocationManger.locationServicesEnabled(); var result = cllocationManger.locationServicesEnabled();
console.log("系统定位开启:" + result); //"系统定位开启:" + result);
plus.ios.deleteObject(cllocationManger); plus.ios.deleteObject(cllocationManger);
return result; return result;
} else { } else {
...@@ -259,7 +259,7 @@ function checkSystemEnableLocation() { ...@@ -259,7 +259,7 @@ function checkSystemEnableLocation() {
var main = plus.android.runtimeMainActivity(); var main = plus.android.runtimeMainActivity();
var mainSvr = main.getSystemService(context.LOCATION_SERVICE); var mainSvr = main.getSystemService(context.LOCATION_SERVICE);
var result = mainSvr.isProviderEnabled(locationManager.GPS_PROVIDER); var result = mainSvr.isProviderEnabled(locationManager.GPS_PROVIDER);
console.log("系统定位开启:" + result); //"系统定位开启:" + result
return result return result
} }
} }
......
...@@ -21,7 +21,6 @@ export default function request(api, method, data, {noAuth = false, noVerify = f ...@@ -21,7 +21,6 @@ export default function request(api, method, data, {noAuth = false, noVerify = f
// title: '加载中...' // title: '加载中...'
// }); // });
// console.info(isurltwo,"isurltwo");
let Url = SiteBaseUrl, header = HEADER; let Url = SiteBaseUrl, header = HEADER;
...@@ -29,9 +28,7 @@ export default function request(api, method, data, {noAuth = false, noVerify = f ...@@ -29,9 +28,7 @@ export default function request(api, method, data, {noAuth = false, noVerify = f
// Url = SiteBaseUrltwo; // Url = SiteBaseUrltwo;
// } // }
// console.info(Url,"Url",noAuth,"noAuth");
// console.info("token",store.state.token);
if (!noAuth) { if (!noAuth) {
//debugger; //debugger;
...@@ -60,15 +57,13 @@ export default function request(api, method, data, {noAuth = false, noVerify = f ...@@ -60,15 +57,13 @@ export default function request(api, method, data, {noAuth = false, noVerify = f
confirmColor:"#ff6900", confirmColor:"#ff6900",
success: (res)=> { success: (res)=> {
if (res.confirm) { if (res.confirm) {
console.log('用户点击确定'); uni.hideLoading();
uni.hideLoading();
uni.navigateTo({ uni.navigateTo({
url: '/pages/login/login?zd=1&isfanhui=1' url: '/pages/login/login?zd=1&isfanhui=1'
}); });
uni.hideLoading(); uni.hideLoading();
} else if (res.cancel) { } else if (res.cancel) {
uni.hideLoading(); uni.hideLoading();
console.log('用户点击取消');
} }
} }
}); });
...@@ -80,7 +75,6 @@ export default function request(api, method, data, {noAuth = false, noVerify = f ...@@ -80,7 +75,6 @@ export default function request(api, method, data, {noAuth = false, noVerify = f
//return false; //return false;
// uni.hideLoading(); // uni.hideLoading();
// console.info("ssss");
} }
} }
...@@ -113,9 +107,7 @@ export default function request(api, method, data, {noAuth = false, noVerify = f ...@@ -113,9 +107,7 @@ export default function request(api, method, data, {noAuth = false, noVerify = f
// data.token = "be09eb9024822c33f0a02632d77b5226---"; // data.token = "be09eb9024822c33f0a02632d77b5226---";
// data.token = store.state.token;//有token 需要把token 带上 // data.token = store.state.token;//有token 需要把token 带上
} }
// console.info("-----------------------------------");
// console.info(data);
// console.info("-----------------------------------");
return new Promise((reslove, reject) => { return new Promise((reslove, reject) => {
uni.request({ uni.request({
url: Url + api, url: Url + api,
...@@ -123,8 +115,6 @@ export default function request(api, method, data, {noAuth = false, noVerify = f ...@@ -123,8 +115,6 @@ export default function request(api, method, data, {noAuth = false, noVerify = f
header: header, header: header,
data: data || {}, data: data || {},
success: (res) => { success: (res) => {
// console.info("data",data);
// console.info("res",res);
// uni.hideLoading(); // uni.hideLoading();
if (noVerify) if (noVerify)
reslove(res.data, res); reslove(res.data, res);
...@@ -148,14 +138,12 @@ export default function request(api, method, data, {noAuth = false, noVerify = f ...@@ -148,14 +138,12 @@ export default function request(api, method, data, {noAuth = false, noVerify = f
confirmColor:"#ff6900", confirmColor:"#ff6900",
success: (res)=> { success: (res)=> {
if (res.confirm) { if (res.confirm) {
console.log('用户点击确定');
uni.hideLoading(); uni.hideLoading();
uni.navigateTo({ uni.navigateTo({
url: '/pages/login/login?zd=1&isfanhui=1' url: '/pages/login/login?zd=1&isfanhui=1'
}); });
uni.hideLoading(); uni.hideLoading();
} else if (res.cancel) { } else if (res.cancel) {
console.log('用户点击取消');
uni.hideLoading(); uni.hideLoading();
} }
} }
......
...@@ -42,7 +42,6 @@ export default function request(api, method, data, {noAuth = false, noVerify = f ...@@ -42,7 +42,6 @@ export default function request(api, method, data, {noAuth = false, noVerify = f
confirmColor:"#ff6900", confirmColor:"#ff6900",
success: (res)=> { success: (res)=> {
if (res.confirm) { if (res.confirm) {
console.log('用户点击确定');
uni.hideLoading(); uni.hideLoading();
uni.navigateTo({ uni.navigateTo({
url: '/pages/login/login?zd=1&isfanhui=1' url: '/pages/login/login?zd=1&isfanhui=1'
...@@ -50,7 +49,6 @@ export default function request(api, method, data, {noAuth = false, noVerify = f ...@@ -50,7 +49,6 @@ export default function request(api, method, data, {noAuth = false, noVerify = f
uni.hideLoading(); uni.hideLoading();
} else if (res.cancel) { } else if (res.cancel) {
uni.hideLoading(); uni.hideLoading();
console.log('用户点击取消');
} }
} }
}); });
...@@ -62,7 +60,6 @@ export default function request(api, method, data, {noAuth = false, noVerify = f ...@@ -62,7 +60,6 @@ export default function request(api, method, data, {noAuth = false, noVerify = f
//return false; //return false;
// uni.hideLoading(); // uni.hideLoading();
console.info("ssss");
} }
} }
...@@ -122,14 +119,12 @@ export default function request(api, method, data, {noAuth = false, noVerify = f ...@@ -122,14 +119,12 @@ export default function request(api, method, data, {noAuth = false, noVerify = f
confirmColor:"#ff6900", confirmColor:"#ff6900",
success: (res)=> { success: (res)=> {
if (res.confirm) { if (res.confirm) {
console.log('用户点击确定');
uni.hideLoading(); uni.hideLoading();
uni.navigateTo({ uni.navigateTo({
url: '/pages/login/login?zd=1&isfanhui=1' url: '/pages/login/login?zd=1&isfanhui=1'
}); });
uni.hideLoading(); uni.hideLoading();
} else if (res.cancel) { } else if (res.cancel) {
console.log('用户点击取消');
uni.hideLoading(); uni.hideLoading();
} }
} }
......
...@@ -77,7 +77,7 @@ const getUrlParam = (name)=> { //name为要获取的参数名 ...@@ -77,7 +77,7 @@ const getUrlParam = (name)=> { //name为要获取的参数名
return obj; return obj;
}catch(e){ }catch(e){
//console.log(e);
return {};//错误后返回空对象 return {};//错误后返回空对象
} }
} }
...@@ -92,7 +92,7 @@ const rmspace = (str)=>{ ...@@ -92,7 +92,7 @@ const rmspace = (str)=>{
if(str){ if(str){
return str.replace(/\s/g,""); return str.replace(/\s/g,"");
}else{ }else{
console.log("请输入字符串"); //"请输入字符串"
return ""; return "";
} }
} }
...@@ -152,7 +152,7 @@ const codeobj = (obj1,obj2)=>{ ...@@ -152,7 +152,7 @@ const codeobj = (obj1,obj2)=>{
let obj = obj2; let obj = obj2;
Object.assign(form, obj); Object.assign(form, obj);
//console.log('after', form);
return form; return form;
...@@ -281,7 +281,7 @@ const checkCardNo = (el)=> { ...@@ -281,7 +281,7 @@ const checkCardNo = (el)=> {
const getTimeOut = ()=> { const getTimeOut = ()=> {
console.log("1");
} }
......
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